fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed duplicates

This commit is contained in:
Robin 2012-01-22 00:10:06 +01:00
parent 9f0ca7cc44
commit 300886da34
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), opera: /opera/.test(userAgent),
msie: /msie/.test(userAgent) && !/opera/.test(userAgent), msie: /msie/.test(userAgent) && !/opera/.test(userAgent),
mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.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 hasLineNumbers = true;
var isStyled = 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 // space around the innermost iframe element
var iframePadLeft = MIN_LINEDIV_WIDTH + LINE_NUMBER_PADDING_RIGHT + EDIT_BODY_PADDING_LEFT; var iframePadLeft = MIN_LINEDIV_WIDTH + LINE_NUMBER_PADDING_RIGHT + EDIT_BODY_PADDING_LEFT;
var iframePadTop = EDIT_BODY_PADDING_TOP; var iframePadTop = EDIT_BODY_PADDING_TOP;
@ -1111,7 +1106,7 @@ function OUTER(gscope)
{ {
hasLineNumbers = !! value; hasLineNumbers = !! value;
// disable line numbers on mobile devices // disable line numbers on mobile devices
if(isAndroid || isMobileSafari) hasLineNumbers = false; if (mobile.browser) hasLineNumbers = false;
setClassPresence(sideDiv, "sidedivhidden", !hasLineNumbers); setClassPresence(sideDiv, "sidedivhidden", !hasLineNumbers);
fixView(); fixView();
} }

5
static/js/chat.js
View File

@ -22,9 +22,6 @@
var chat = (function() var chat = (function()
{ {
var ua = navigator.userAgent.toLowerCase();
var isAndroid = ua.indexOf("android") > -1;
var isMobileSafari = ua.indexOf("mobile") > -1;
var bottomMargin = "0px"; var bottomMargin = "0px";
var sDuration = 500; var sDuration = 500;
var hDuration = 750; var hDuration = 750;
@ -57,7 +54,7 @@ var chat = (function()
{ {
$("#focusprotector").hide(); $("#focusprotector").hide();
if(isAndroid || isMobileSafari) if(browser.mobile)
bottommargin = "32px"; bottommargin = "32px";
$("#chatbox").css({right: "20px", bottom: bottomMargin, left: "", top: ""}); $("#chatbox").css({right: "20px", bottom: bottomMargin, left: "", top: ""});