fixed chat repeat

ajbogh · Aug 10, 2012 · 61a0fa1 · 61a0fa1
1 parent 226ef3a
commit 61a0fa1
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 38 deletions.
diff --git a/example/index.html b/example/index.html
@@ -82,7 +82,7 @@
         var messages = document.getElementById('messages');
         msg = sanitize(msg);
         if (color) {
-          msg = '<span style="color: #' + color + '; padding-left: 15px">' + msg + '</span>';
+          msg = '<span style="color: ' + color + '; padding-left: 15px">' + msg + '</span>';
         } else {
           msg = '<strong style="padding-left: 15px">' + msg + '</strong>';
         }

diff --git a/example/server.js b/example/server.js
@@ -21,46 +21,38 @@ app.get('/webrtc.io.js', function(req, res) {
 
 webRTC.rtc.on('connect', function(rtc) {
   //Client connected
-  console.log('connection');
-
-  rtc.on('send answer', function() {
-    //answer sent
-    console.log('send answer');
-  });
-
-  rtc.on('disconnect', function() {
-    console.log('disconnect');
-  });
-
-  rtc.on('chat_msg', function(data, socket) {
-    var roomList = rtc.rooms[data.room] || [];
-    console.log(roomList);
-
-    for (var i = 0; i<roomList.length; i++) {
-
-      var socketId = roomList[i];
+  console.log('connect');
+});
 
-      console.log(socketId);
+webRTC.rtc.on('send answer', function(rtc) {
+  //answer sent
+  console.log('send answer');
+});
 
-      if (socketId == socket.id) {
-        continue;
-      }
-      else {
-        var soc = rtc.getSocket(data.room, socketId);
+webRTC.rtc.on('disconnect', function(rtc) {
+  console.log('disconnect');
+});
 
-        if (soc) {
-          console.log('chat_msg send');
-          soc.send(JSON.stringify({
-            "eventName": "receive_chat_msg",
-            "messages": data.messages,
-            "color": data.color
-          }), function(error) {
-            if (error) {
-              console.log(error);
-            }
-          });
-        }
+webRTC.rtc.on('chat_msg', function(data, socket) {
+  var roomList = webRTC.rtc.rooms[data.room] || [];
+
+  for (var i = 0; i < roomList.length; i++) {
+    var socketId = roomList[i];
+
+    if (socketId !== socket.id) {
+      var soc = webRTC.rtc.getSocket(data.room, socketId);
+
+      if (soc) {
+        soc.send(JSON.stringify({
+          "eventName": "receive_chat_msg",
+          "messages": data.messages,
+          "color": data.color
+        }), function(error) {
+          if (error) {
+            console.log(error);
+          }
+        });
       }
     }
-  });
+  }
 });