public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

pull/344/merge
Peter 'Pita' Martischka 2012-01-22 15:24:02 +01:00
parent d391dab558 6b19ffeaf6
commit cece2c858e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/chat.js
View File

@ -27,7 +27,7 @@ var chat = (function()
var hDuration = 750; var hDuration = 750;
var chatMentions = 0; var chatMentions = 0;
var title = document.title; var title = document.title;
if (isAndroid || isMobileSafari){ if ($.browser.mobile){
sDuration = 0; sDuration = 0;
hDuration = 0; hDuration = 0;
} }
@ -54,7 +54,7 @@ var chat = (function()
{ {
$("#focusprotector").hide(); $("#focusprotector").hide();
if(browser.mobile) if($.browser.mobile)
bottommargin = "32px"; bottommargin = "32px";
$("#chatbox").css({right: "20px", bottom: bottomMargin, left: "", top: ""}); $("#chatbox").css({right: "20px", bottom: bottomMargin, left: "", top: ""});