Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Pita/etherpad-lite
Browse files Browse the repository at this point in the history
  • Loading branch information
Pita committed Jan 22, 2012
2 parents d391dab + 6b19ffe commit cece2c8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions static/js/chat.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ var chat = (function()
var hDuration = 750;
var chatMentions = 0;
var title = document.title;
if (isAndroid || isMobileSafari){
if ($.browser.mobile){
sDuration = 0;
hDuration = 0;
}
Expand All @@ -54,7 +54,7 @@ var chat = (function()
{
$("#focusprotector").hide();

if(browser.mobile)
if($.browser.mobile)
bottommargin = "32px";

$("#chatbox").css({right: "20px", bottom: bottomMargin, left: "", top: ""});
Expand Down

0 comments on commit cece2c8

Please sign in to comment.