From 185a3bface84c3f88f21382aa12b75df9d6a9c07 Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Sun, 20 May 2012 20:19:16 +0300
Subject: [PATCH 1/9] Add def. bg to <select> and remove useless style

---
 src/static/css/pad.css | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 86bb439d..2a70c73a 100644
--- a/src/static/css/pad.css
+++ b/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) */

From 06c36f3023404f0950e03db028bc9887a24ecdff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= <mba@fourplusone.de>
Date: Tue, 22 May 2012 09:31:28 +0200
Subject: [PATCH 2/9] fix #722 by better argument checking in
 PadMessageHandler.js

---
 src/node/handler/PadMessageHandler.js | 44 ++++++++++++---------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index 4a570e21..3f6cfa56 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -177,31 +177,25 @@ exports.handleMessage = function(client, message)
   {
     handleClientReady(client, message);
   }
-  else if(message.type == "COLLABROOM" && 
-          message.data.type == "USER_CHANGES")
-  {
-    handleUserChanges(client, message);
-  }
-  else if(message.type == "COLLABROOM" && 
-          message.data.type == "USERINFO_UPDATE")
-  {
-    handleUserInfoUpdate(client, message);
-  }
-  else if(message.type == "COLLABROOM" && 
-          message.data.type == "CHAT_MESSAGE")
-  {
-    handleChatMessage(client, message);
-  }
-  else if(message.type == "COLLABROOM" && 
-          message.data.type == "SAVE_REVISION")
-  {
-    handleSaveRevisionMessage(client, message);
-  }
-  else if(message.type == "COLLABROOM" && 
-          message.data.type == "CLIENT_MESSAGE" &&
-          message.data.payload.type == "suggestUserName")
-  {
-    handleSuggestUserName(client, message);
+  else if(message.type == "COLLABROOM" && typeof message.data == 'object'){
+    if (message.data.type == "USER_CHANGES")
+    {
+      handleUserChanges(client, message);
+    }
+    else if (message.data.type == "USERINFO_UPDATE")
+    {
+      handleUserInfoUpdate(client, message);
+    }
+    else if(message.data.type == "CHAT_MESSAGE")
+    {
+      handleChatMessage(client, message);
+    }
+    else if(message.data.type == "CLIENT_MESSAGE" &&
+            typeof message.data.payload == 'object' &&
+            message.data.payload.type == "suggestUserName")
+    {
+      handleSuggestUserName(client, message);
+    }
   }
   //if the message type is unknown, throw an exception
   else

From 9c6731f3b84f7c2410e1f217e97ad0b170260d37 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Tue, 22 May 2012 21:30:50 +0200
Subject: [PATCH 3/9] No comet required on landing page

---
 src/templates/index.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/templates/index.html b/src/templates/index.html
index fbc26780..4a45d6a5 100644
--- a/src/templates/index.html
+++ b/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;

From c8b93f6ddcdda0fbbec65b3ddbed366703066e1a Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 23 May 2012 00:46:56 +0200
Subject: [PATCH 4/9] Fix IE import

---
 src/node/handler/ImportHandler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index ed5eb05e..9eb485fa 100644
--- a/src/node/handler/ImportHandler.js
+++ b/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>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);
   });
 }

From b27287ce37bacf8b8d6099481e0241a7a008b4a9 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 23 May 2012 00:49:12 +0200
Subject: [PATCH 5/9] Update src/node/handler/ImportHandler.js

---
 src/node/handler/ImportHandler.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index 9eb485fa..da8dcf57 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -196,6 +196,14 @@ exports.doImport = function(req, res, padId)
     ERR(err);
   
     //close the connection
-    res.send("<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);
+    res.send("
+      <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);
   });
 }

From dafa44e6b4c9136daa07971167f16d4082f194ea Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 23 May 2012 00:51:03 +0200
Subject: [PATCH 6/9] I hate how hacky this change is.

---
 src/node/handler/ImportHandler.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index da8dcf57..0cf07370 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -196,14 +196,6 @@ exports.doImport = function(req, res, padId)
     ERR(err);
   
     //close the connection
-    res.send("
-      <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);
+    res.send("<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);
   });
 }

From d1c2d1215054953b5f75145924423d42767f9435 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 23 May 2012 00:52:10 +0200
Subject: [PATCH 7/9] Import Should now work in IE

---
 src/node/handler/ImportHandler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index 0cf07370..1454a25d 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -196,6 +196,6 @@ exports.doImport = function(req, res, padId)
     ERR(err);
   
     //close the connection
-    res.send("<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);
+    res.send("<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);
   });
 }

From 26614bf2d59186149b335c49110e5c5dd68f5e83 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 23 May 2012 01:01:50 +0200
Subject: [PATCH 8/9] You can't use $ if no jQuery is available..  Apologies
 for so much spam on this issue, this finally resolves #594

---
 src/node/handler/ImportHandler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index 1454a25d..788706ce 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -196,6 +196,6 @@ exports.doImport = function(req, res, padId)
     ERR(err);
   
     //close the connection
-    res.send("<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);
+    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);
   });
 }

From d4b4ca0a5c62f9835da876cd950c9c2d4315d3cb Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Wed, 23 May 2012 20:40:24 +0300
Subject: [PATCH 9/9] Center user icon and fix overlapping chat

---
 src/static/css/pad.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 2a70c73a..b1187b09 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -154,6 +154,7 @@ a img {
 }
 #usericon a {
   min-width: 30px;
+  text-align: left;
 }
 #usericon a #online_count {
   color: #777;
@@ -901,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;