mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-08 08:01:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

merge with upstream. Fixed confict in pad.html

Browse source
This commit is contained in:
Jean-Tiare Le Bigot 2012-01-08 19:32:06 +01:00
parent 3248ca4cbb
commit 254046454d
91 changed files with 1674 additions and 1363 deletions
Download patch file Download diff file Expand all files Collapse all files

31
static/js/chat.js
View file

@ -1,3 +1,9 @@
/**
* This code is mostly from the old Etherpad. Please help us to comment this code.
* This helps other people to understand this code better and helps them to improve it.
* TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
*/
/**
* Copyright 2009 Google Inc., 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
*
@ -16,21 +22,33 @@
var chat = (function()
{
var ua = navigator.userAgent.toLowerCase();
var isAndroid = ua.indexOf("android") > -1;
var isMobileSafari = ua.indexOf("mobile") > -1;
var bottomMargin = "0px";
var sDuration = 500;
var hDuration = 750;
var chatMentions = 0;
var title = document.title;
if (isAndroid || isMobileSafari){
sDuration = 0;
hDuration = 0;
}
var self = {
show: function ()
{
$("#chaticon").hide("slide", {
direction: "down"
}, 500, function ()
}, hDuration, function ()
{
$("#chatbox").show("slide", {
direction: "down"
}, 750, self.scrollDown);
}, sDuration, self.scrollDown);
$("#chatbox").resizable(
{
handles: 'nw',
minHeight: 40,
minWidth: 80,
start: function (event, ui)
{
$("#focusprotector").show();
@ -39,7 +57,10 @@ var chat = (function()
{
$("#focusprotector").hide();
$("#chatbox").css({right: "20px", bottom: "0px", left: "", top: ""});
if(isAndroid || isMobileSafari)
bottommargin = "32px";
$("#chatbox").css({right: "20px", bottom: bottomMargin, left: "", top: ""});
self.scrollDown();
}
@ -51,9 +72,9 @@ var chat = (function()
hide: function ()
{
$("#chatcounter").text("0");
$("#chatbox").hide("slide", { direction: "down" }, 750, function()
$("#chatbox").hide("slide", { direction: "down" }, sDuration, function()
{
$("#chaticon").show("slide", { direction: "down" }, 500);
$("#chaticon").show("slide", { direction: "down" }, hDuration);
});
},
scrollDown: function()