Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop

src/node/handler/ImportHandler.js

@@ -196,6 +196,6 @@ exports.doImport = function(req, res, padId)
     ERR(err);
   
     //close the connection
-    res.send("<script>document.domain = document.domain; var impexp = window.top.require('/pad_impexp').padimpexp.handleFrameCall('" + status + "'); </script>", 200);
+    res.send("<script type='text/javascript' src='/static/js/jquery.js'></script><script> if ( (!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf(\"1.8.\") == 0)) ){document.domain = document.domain;}var impexp = window.top.require('/pad_impexp').padimpexp.handleFrameCall('" + status + "');</script>", 200);
   });
 }

src/node/handler/PadMessageHandler.js

@@ -177,31 +177,25 @@ exports.handleMessage = function(client, message)
   {
     handleClientReady(client, message);
   }
-  else if(message.type == "COLLABROOM" && 
+  else if(message.type == "COLLABROOM" && typeof message.data == 'object'){
-          message.data.type == "USER_CHANGES")
+    if (message.data.type == "USER_CHANGES")
-  {
+    {
-    handleUserChanges(client, message);
+      handleUserChanges(client, message);
-  }
+    }
-  else if(message.type == "COLLABROOM" && 
+    else if (message.data.type == "USERINFO_UPDATE")
-          message.data.type == "USERINFO_UPDATE")
+    {
-  {
+      handleUserInfoUpdate(client, message);
-    handleUserInfoUpdate(client, message);
+    }
-  }
+    else if(message.data.type == "CHAT_MESSAGE")
-  else if(message.type == "COLLABROOM" && 
+    {
-          message.data.type == "CHAT_MESSAGE")
+      handleChatMessage(client, message);
-  {
+    }
-    handleChatMessage(client, message);
+    else if(message.data.type == "CLIENT_MESSAGE" &&
-  }
+            typeof message.data.payload == 'object' &&
-  else if(message.type == "COLLABROOM" && 
+            message.data.payload.type == "suggestUserName")
-          message.data.type == "SAVE_REVISION")
+    {
-  {
+      handleSuggestUserName(client, message);
-    handleSaveRevisionMessage(client, message);
+    }
-  }
-  else if(message.type == "COLLABROOM" && 
-          message.data.type == "CLIENT_MESSAGE" &&
-          message.data.payload.type == "suggestUserName")
-  {
-    handleSuggestUserName(client, message);
   }
   //if the message type is unknown, throw an exception
   else

src/static/css/pad.css

@@ -80,10 +80,6 @@ a img {
 .toolbar ul li a:hover {
   text-decoration: none;
 }
-.toolbar ul li a span {
-  position: relative;
-  top: -2px;
-}
 .toolbar ul li a:hover {
   background: #fff;
   background: -webkit-linear-gradient(#f4f4f4, #e4e4e4);
@@ -148,6 +144,7 @@ a img {
   background: linear-gradient(#EEE, #F0F0F0) !important;
 }
 .toolbar ul li select {
+  background: #fff;
   padding: 4px;
   line-height: 22px; /* fix for safari (win/mac) */
   height: 28px; /* fix for chrome (mac) */
@@ -157,6 +154,7 @@ a img {
 }
 #usericon a {
   min-width: 30px;
+  text-align: left;
 }
 #usericon a #online_count {
   color: #777;
@@ -904,7 +902,7 @@ input[type=checkbox] {
 .stickyChat {
   background-color: #f1f1f1 !important;
   right: 0px !important;
-  top: 36px;
+  top: 37px;
   -webkit-border-radius: 0px !important;
   -moz-border-radius: 0px !important;
   border-radius: 0px !important;

src/templates/index.html

@@ -132,11 +132,7 @@
 
         <script src="static/custom/index.js"></script>
         <script> 
-            if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0)))
+      
-            {
-              document.domain = document.domain; // for comet
-            }
-
             function go2Name() 
             {
                 var padname = document.getElementById("padname").value;