Merge c16d6eefdf into 8d7ec7d24a

node/utils/tar.json

@@ -18,7 +18,6 @@
   , "pad_impexp.js"
   , "pad_savedrevs.js"
   , "pad_connectionstatus.js"
-  , "jquery-ui.js"
   , "chat.js"
   , "excanvas.js"
   , "farbtastic.js"

static/js/chat.js

@@ -37,36 +37,8 @@ var chat = (function()
   var self = {
     show: function () 
     {      
-      $("#chaticon").hide("slide", {
-        direction: "down"
-      }, hDuration, function ()
-      {
-        $("#chatbox").show("slide", {
-          direction: "down"
-        }, sDuration, self.scrollDown);
-        $("#chatbox").resizable(
-        {
-          handles: 'nw',
-          minHeight: 40,
-          minWidth: 80,
-          start: function (event, ui)
-          {
-            $("#focusprotector").show();
-          },
-          stop: function (event, ui)
-          {
-            $("#focusprotector").hide();
-            
-            if(browser.mobile) {
-              $("#chatbox").css({right: "0px", bottom: "32px", left: "", top: ""});
-            } else {
-              $("#chatbox").css({right: "20px", bottom: "0px", left: "", top: ""});
-            }
-
-            self.scrollDown();
-          }
-        });
-      });
+      $("#chaticon").hide();
+      $("#chatbox").show();
       chatMentions = 0;
       document.title = title;
     },
@@ -90,10 +62,8 @@ var chat = (function()
     hide: function () 
     {
       $("#chatcounter").text("0");
-      $("#chatbox").hide("slide", { direction: "down" }, sDuration, function()
-      {
-        $("#chaticon").show("slide", { direction: "down" }, hDuration);
-      });
+      $("#chatbox").hide();
+      $("#chaticon").show();
     },
     scrollDown: function()
     {

static/js/pad.js

@@ -27,7 +27,6 @@ var socket;
 // These jQuery things should create local references, but for now `require()`
 // assigns to the global `$` and augments it with plugins.
 require('/jquery');
-require('/jquery-ui');
 require('/farbtastic');
 require('/excanvas');
 JSON = require('/json2');