mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-05-05 06:37:10 -04:00
Merge c16d6eefdf
into 8d7ec7d24a
This commit is contained in:
commit
d3e18ad3c6
3 changed files with 4 additions and 36 deletions
|
@ -18,7 +18,6 @@
|
||||||
, "pad_impexp.js"
|
, "pad_impexp.js"
|
||||||
, "pad_savedrevs.js"
|
, "pad_savedrevs.js"
|
||||||
, "pad_connectionstatus.js"
|
, "pad_connectionstatus.js"
|
||||||
, "jquery-ui.js"
|
|
||||||
, "chat.js"
|
, "chat.js"
|
||||||
, "excanvas.js"
|
, "excanvas.js"
|
||||||
, "farbtastic.js"
|
, "farbtastic.js"
|
||||||
|
|
|
@ -37,36 +37,8 @@ var chat = (function()
|
||||||
var self = {
|
var self = {
|
||||||
show: function ()
|
show: function ()
|
||||||
{
|
{
|
||||||
$("#chaticon").hide("slide", {
|
$("#chaticon").hide();
|
||||||
direction: "down"
|
$("#chatbox").show();
|
||||||
}, 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();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
chatMentions = 0;
|
chatMentions = 0;
|
||||||
document.title = title;
|
document.title = title;
|
||||||
},
|
},
|
||||||
|
@ -90,10 +62,8 @@ var chat = (function()
|
||||||
hide: function ()
|
hide: function ()
|
||||||
{
|
{
|
||||||
$("#chatcounter").text("0");
|
$("#chatcounter").text("0");
|
||||||
$("#chatbox").hide("slide", { direction: "down" }, sDuration, function()
|
$("#chatbox").hide();
|
||||||
{
|
$("#chaticon").show();
|
||||||
$("#chaticon").show("slide", { direction: "down" }, hDuration);
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
scrollDown: function()
|
scrollDown: function()
|
||||||
{
|
{
|
||||||
|
|
|
@ -27,7 +27,6 @@ var socket;
|
||||||
// These jQuery things should create local references, but for now `require()`
|
// These jQuery things should create local references, but for now `require()`
|
||||||
// assigns to the global `$` and augments it with plugins.
|
// assigns to the global `$` and augments it with plugins.
|
||||||
require('/jquery');
|
require('/jquery');
|
||||||
require('/jquery-ui');
|
|
||||||
require('/farbtastic');
|
require('/farbtastic');
|
||||||
require('/excanvas');
|
require('/excanvas');
|
||||||
JSON = require('/json2');
|
JSON = require('/json2');
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue