Update ChatActivity to wait connection

Author: Lionel Laské

activities/ChatPrototype.activity/css/activity.css

@@ -45,6 +45,10 @@ color:green;
 color:red;
 }
 
+.error {
+color:red;
+}
+
 ul {
 list-style:none;
 font-size:.95rem;

activities/ChatPrototype.activity/index.html

@@ -33,7 +33,7 @@
         <div id="content"><ul id="messages"></ul></div>
 
 
-        <textarea id="message" placeholder="Send Message" required autofocus></textarea>
+        <textarea id="message" placeholder="Send Message" required autofocus readonly></textarea>
         <p id="status">Connecting...</p>
 </div>
 </body>

activities/ChatPrototype.activity/js/activity.js

@@ -23,20 +23,26 @@ define(function (require) {
         var presenceObject = new SugarPresence();
 
         var sugarSettings = JSON.parse(localStorage.sugar_settings);
-
         var userInfo = [sugarSettings.name, sugarSettings.colorvalue];
 
         console.log(userInfo);
-        socketStatus.innerHTML = 'Connected';
-        socketStatus.className = 'open';
 
         if (sugarSettings.name == '<No name>') {
 
             userInfo[0] = 'User';
 
         }
 
-        presenceObject.joinNetwork(userInfo);
+        presenceObject.joinNetwork(userInfo, function (error, user) {
+			if (error)  {
+				socketStatus.innerHTML = 'Error';			
+				socketStatus.className = 'error';
+			} else {
+				socketStatus.innerHTML = 'Connected';
+				socketStatus.className = 'open';
+				messageField.readOnly = false;
+			}
+		});
 
         // Handle messages received.
         presenceObject.onDataReceived(function (msg) {

activities/ChatPrototype.activity/lib/sugar-web/presence.js

@@ -37,7 +37,7 @@
 
         }
 
-    SugarPresence.prototype.joinNetwork = function(userInfo) {
+    SugarPresence.prototype.joinNetwork = function(userInfo, callback) {
 
 		var server = location.hostname;
 		if (localStorage.sugar_settings) {
@@ -55,10 +55,12 @@
 
         this.socket.onerror = function(error) {
             console.log('WebSocket Error: ' + error);
+			callback(error, null);
         };
         var that = this;
         this.onConnectionOpen(function (event) {
             that.registerUser("sampleuserId",userInfo);
+			callback(null, userInfo);
         });
     }
 

js/homeview.js

@@ -47,7 +47,7 @@ enyo.kind({
 		});
 
 		// Call activities list service
-		if (preferences.isConnected()) {
+		if (util.getClientType() == constant.thinClientType) {
 			this.$.activities.setUrl(myserver.getActivitiesUrl());
 		} else {
 			this.$.activities.setUrl(constant.staticInitActivitiesURL);