libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #346 from 0ip/ua_dupl

Browse source 
Fix for UA-detection duplicates
This commit is contained in:
John McLear 2012-01-21 16:11:35 -08:00
commit a1081d47ba
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
static/js/ace2_common.js
View file

@ -95,7 +95,8 @@ var browser = {
opera: /opera/.test(userAgent),
msie: /msie/.test(userAgent) && !/opera/.test(userAgent),
mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.test(userAgent),
windows: /windows/.test(userAgent) // dgreensp
windows: /windows/.test(userAgent)
mobile: /mobile/.test(userAgent) || /android/.test(userAgent);
};

7
static/js/ace2_inner.js
View file

@ -86,11 +86,6 @@ function OUTER(gscope)
var hasLineNumbers = true;
var isStyled = true;
// check for mobile os presence
var ua = navigator.userAgent.toLowerCase();
var isAndroid = ua.indexOf("android") > -1;
var isMobileSafari = ua.indexOf("mobile") > -1;
// space around the innermost iframe element
var iframePadLeft = MIN_LINEDIV_WIDTH + LINE_NUMBER_PADDING_RIGHT + EDIT_BODY_PADDING_LEFT;
var iframePadTop = EDIT_BODY_PADDING_TOP;
@ -1111,7 +1106,7 @@ function OUTER(gscope)
{
hasLineNumbers = !! value;
// disable line numbers on mobile devices
if(isAndroid || isMobileSafari) hasLineNumbers = false;
if (browser.mobile) hasLineNumbers = false;
setClassPresence(sideDiv, "sidedivhidden", !hasLineNumbers);
fixView();
}

5
static/js/chat.js
View file

@ -22,9 +22,6 @@
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;
@ -57,7 +54,7 @@ var chat = (function()
{
$("#focusprotector").hide();
if(isAndroid || isMobileSafari)
if(browser.mobile)
bottommargin = "32px";
$("#chatbox").css({right: "20px", bottom: bottomMargin, left: "", top: ""});