Merge branch 'master' of git://github.com/Pita/etherpad-lite into api

1 files changed, 22 insertions, 9 deletions

diff --git a/static/js/chat.js b/static/js/chat.js
index 3cd7e01b..f617bdb3 100644
--- a/static/js/chat.js
+++ b/static/js/chat.js
@@ -3,16 +3,29 @@ var chat = (function()
   var self = {
     show: function () 
     {      
-      $("#chaticon").hide("slide", { direction: "down" }, 500, function()
+      $("#chaticon").hide("slide", {
+        direction: "down"
+      }, 500, function ()
       {
-        $("#chatbox").show("slide", { direction: "down" }, 750, self.scrollDown);
- 	$("#chatbox").resizable({ handles: 'nw', start: function(event,ui){
-	  $("#editorcontainer").hide();
-        }, stop: function(event,ui){
-          $("#editorcontainer").show();
- 	  self.scrollDown();
-        }});
-
+        $("#chatbox").show("slide", {
+          direction: "down"
+        }, 750, self.scrollDown);
+        $("#chatbox").resizable(
+        {
+          handles: 'nw',
+          start: function (event, ui)
+          {
+            $("#focusprotector").show();
+          },
+          stop: function (event, ui)
+          {
+            $("#focusprotector").hide();
+            
+            $("#chatbox").css({right: "20px", bottom: "0px", left: "", top: ""});
+            
+            self.scrollDown();
+          }
+        });
       });
     },
     hide: function ()