From a2e81736a91f72c8688e6ab0f45061369614dae3 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 19 Jun 2010 13:46:11 -0400
Subject: [PATCH] - Move quota indicator to mailboxlist footer - Fix groupcontrols on IE6 (use gif)
---
program/js/common.js | 172 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 110 insertions(+), 62 deletions(-)
diff --git a/program/js/common.js b/program/js/common.js
index d23a133..4a2a41c 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -28,6 +28,7 @@
this.ver = parseFloat(navigator.appVersion);
this.appver = navigator.appVersion;
this.agent = navigator.userAgent;
+ this.agent_lc = navigator.userAgent.toLowerCase();
this.name = navigator.appName;
this.vendor = navigator.vendor ? navigator.vendor : '';
this.vendver = navigator.vendorSub ? parseFloat(navigator.vendorSub) : 0;
@@ -37,39 +38,44 @@
(navigator.browserLanguage) ? navigator.browserLanguage.substring(0,2) :
(navigator.systemLanguage) ? navigator.systemLanguage.substring(0,2) : 'en';
- this.win = (this.platform.indexOf('win')>=0) ? true : false;
- this.mac = (this.platform.indexOf('mac')>=0) ? true : false;
- this.linux = (this.platform.indexOf('linux')>=0) ? true : false;
- this.unix = (this.platform.indexOf('unix')>=0) ? true : false;
+ this.win = (this.platform.indexOf('win') >= 0);
+ this.mac = (this.platform.indexOf('mac') >= 0);
+ this.linux = (this.platform.indexOf('linux') >= 0);
+ this.unix = (this.platform.indexOf('unix') >= 0);
this.dom = document.getElementById ? true : false;
this.dom2 = (document.addEventListener && document.removeEventListener);
- this.ie = (document.all) ? true : false;
+ this.ie = (document.all && !window.opera);
this.ie4 = (this.ie && !this.dom);
this.ie5 = (this.dom && this.appver.indexOf('MSIE 5')>0);
this.ie8 = (this.dom && this.appver.indexOf('MSIE 8')>0);
this.ie7 = (this.dom && this.appver.indexOf('MSIE 7')>0);
this.ie6 = (this.dom && !this.ie8 && !this.ie7 && this.appver.indexOf('MSIE 6')>0);
- this.mz = (this.dom && this.ver>=5); // (this.dom && this.product=='Gecko')
- this.ns = ((this.ver<5 && this.name=='Netscape') || (this.ver>=5 && this.vendor.indexOf('Netscape')>=0));
- this.ns6 = (this.ns && parseInt(this.vendver)==6); // (this.mz && this.ns) ? true : false;
- this.ns7 = (this.ns && parseInt(this.vendver)==7); // this.agent.indexOf('Netscape/7')>0);
- this.safari = (this.agent.toLowerCase().indexOf('safari')>0 || this.agent.toLowerCase().indexOf('applewebkit')>0);
- this.konq = (this.agent.toLowerCase().indexOf('konqueror')>0);
+ this.mz = (this.dom && this.ver >= 5); // (this.dom && this.product=='Gecko')
+ this.ns = ((this.ver < 5 && this.name == 'Netscape') || (this.ver >= 5 && this.vendor.indexOf('Netscape') >= 0));
+ this.ns6 = (this.ns && parseInt(this.vendver) == 6); // (this.mz && this.ns) ? true : false;
+ this.ns7 = (this.ns && parseInt(this.vendver) == 7); // this.agent.indexOf('Netscape/7')>0);
+ this.safari = (this.agent_lc.indexOf('safari') > 0 || this.agent.toLowerCase().indexOf('applewebkit') > 0);
+ this.konq = (this.agent_lc.indexOf('konqueror') > 0);
+ this.chrome = (this.agent_lc.indexOf('chrome') > 0);
+ this.iphone = (this.safari && this.agent_lc.indexOf('iphone') > 0);
+ this.ipad = (this.safari && this.agent_lc.indexOf('ipad') > 0);
- this.opera = (window.opera) ? true : false;
+ this.opera = window.opera ? true : false;
- if(this.opera && window.RegExp)
+ if (this.opera && window.RegExp)
this.vendver = (/opera(\s|\/)([0-9\.]+)/i.test(navigator.userAgent)) ? parseFloat(RegExp.$2) : -1;
- else if(!this.vendver && this.safari)
+ else if (this.chrome && window.RegExp)
+ this.vendver = (/chrome\/([0-9\.]+)/i.test(this.agent)) ? parseFloat(RegExp.$1) : 0;
+ else if (!this.vendver && this.safari)
this.vendver = (/(safari|applewebkit)\/([0-9]+)/i.test(this.agent)) ? parseInt(RegExp.$2) : 0;
- else if((!this.vendver && this.mz) || this.agent.indexOf('Camino')>0)
+ else if ((!this.vendver && this.mz) || this.agent.indexOf('Camino')>0)
this.vendver = (/rv:([0-9\.]+)/.test(this.agent)) ? parseFloat(RegExp.$1) : 0;
- else if(this.ie && window.RegExp)
+ else if (this.ie && window.RegExp)
this.vendver = (/msie\s+([0-9\.]+)/i.test(this.agent)) ? parseFloat(RegExp.$1) : 0;
- else if(this.konq && window.RegExp)
+ else if (this.konq && window.RegExp)
this.vendver = (/khtml\/([0-9\.]+)/i.test(this.agent)) ? parseFloat(RegExp.$1) : 0;
// get real language out of safari's user agent
@@ -78,17 +84,57 @@
this.dhtml = ((this.ie4 && this.win) || this.ie5 || this.ie6 || this.ns4 || this.mz);
this.vml = (this.win && this.ie && this.dom && !this.opera);
- this.pngalpha = (this.mz || (this.opera && this.vendver>=6) || (this.ie && this.mac && this.vendver>=5) ||
- (this.ie && this.win && this.vendver>=5.5) || this.safari);
- this.opacity = (this.mz || (this.ie && this.vendver>=5.5 && !this.opera) || (this.safari && this.vendver>=100));
+ this.pngalpha = (this.mz || (this.opera && this.vendver >= 6) || (this.ie && this.mac && this.vendver >= 5) ||
+ (this.ie && this.win && this.vendver >= 5.5) || this.safari);
+ this.opacity = (this.mz || (this.ie && this.vendver >= 5.5 && !this.opera) || (this.safari && this.vendver >= 100));
this.cookies = navigator.cookieEnabled;
-
+
// test for XMLHTTP support
- this.xmlhttp_test = function() {
+ this.xmlhttp_test = function()
+ {
var activeX_test = new Function("try{var o=new ActiveXObject('Microsoft.XMLHTTP');return true;}catch(err){return false;}");
- this.xmlhttp = (window.XMLHttpRequest || (window.ActiveXObject && activeX_test())) ? true : false;
+ this.xmlhttp = (window.XMLHttpRequest || (window.ActiveXObject && activeX_test()));
return this.xmlhttp;
- }
+ };
+
+ // set class names to html tag according to the current user agent detection
+ // this allows browser-specific css selectors like "html.chrome .someclass"
+ this.set_html_class = function()
+ {
+ var classname = ' js';
+
+ if (this.ie) {
+ classname += ' ie';
+ if (this.ie5)
+ classname += ' ie5';
+ else if (this.ie6)
+ classname += ' ie6';
+ else if (this.ie7)
+ classname += ' ie7';
+ else if (this.ie8)
+ classname += ' ie8';
+ }
+ else if (this.opera)
+ classname += ' opera';
+ else if (this.konq)
+ classname += ' konqueror';
+ else if (this.safari)
+ classname += ' safari';
+
+ if (this.chrome)
+ classname += ' chrome';
+ else if (this.iphone)
+ classname += ' iphone';
+ else if (this.ipad)
+ classname += ' ipad';
+ else if (this.ns6)
+ classname += ' netscape6';
+ else if (this.ns7)
+ classname += ' netscape7';
+
+ if (document.documentElement)
+ document.documentElement.className += classname;
+ };
};
@@ -132,7 +178,7 @@
if (bw.mac && e) {
opcode += (e.metaKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
- return opcode;
+ return opcode;
}
if (e) {
opcode += (e.ctrlKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
@@ -146,7 +192,6 @@
get_mouse_pos: function(e)
{
if (!e) e = window.event;
-
var mX = (e.pageX) ? e.pageX : e.clientX,
mY = (e.pageY) ? e.pageY : e.clientY;
@@ -175,7 +220,7 @@
if (!p.object._rc_events)
p.object._rc_events = [];
-
+
var key = p.event + '*' + p.method;
if (!p.object._rc_events[key])
p.object._rc_events[key] = function(e){ return p.object[p.method](e); };
@@ -225,6 +270,11 @@
e.cancelBubble = true;
e.returnValue = false;
return false;
+},
+
+touchevent: function(e)
+{
+ return { pageX:e.pageX, pageY:e.pageY, offsetX:e.pageX - e.target.offsetLeft, offsetY:e.pageY - e.target.offsetTop, target:e.target, istouch:true };
}
};
@@ -253,7 +303,7 @@
this._events = {};
if (!this._events[evt])
this._events[evt] = [];
-
+
var e = {func:func, obj:obj ? obj : window};
this._events[evt][this._events[evt].length] = e;
},
@@ -268,7 +318,7 @@
{
if (typeof obj == 'undefined')
obj = window;
-
+
for (var h,i=0; this._events && this._events[evt] && i < this._events[evt].length; i++)
if ((h = this._events[evt][i]) && h.func == func && h.obj == obj)
this._events[evt][i] = null;
@@ -296,7 +346,7 @@
ret = h.func.call ? h.func.call(h.obj, e) : h.func(e);
else if (typeof h.obj[h.func] == 'function')
ret = h.obj[h.func](e);
-
+
// cancel event execution
if (typeof ret != 'undefined' && !ret)
break;
@@ -320,7 +370,7 @@
function rcube_layer(id, attributes)
{
this.name = id;
-
+
// create a new layer in the current document
this.create = function(arg)
{
@@ -344,7 +394,8 @@
width = w.toString().match(/\%$/) ? w : w+'px';
if (h)
height = h.toString().match(/\%$/) ? h : h+'px';
- if(z) zIndex = z;
+ if (z)
+ zIndex = z;
}
}
@@ -357,14 +408,14 @@
};
// create new layer
- if(attributes != null) {
+ if (attributes != null) {
this.create(attributes);
this.name = this.elm.id;
}
else // just refer to the object
this.elm = document.getElementById(id);
- if(!this.elm)
+ if (!this.elm)
return false;
@@ -431,20 +482,19 @@
function rcube_check_email(input, inline)
{
if (input && window.RegExp) {
- var qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]',
- dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]',
- atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+',
- quoted_pair = '\\x5c[\\x00-\\x7f]',
- domain_literal = '\\x5b('+dtext+'|'+quoted_pair+')*\\x5d',
- quoted_string = '\\x22('+qtext+'|'+quoted_pair+')*\\x22',
- sub_domain = '('+atom+'|'+domain_literal+')',
- word = '('+atom+'|'+quoted_string+')',
- domain = sub_domain+'(\\x2e'+sub_domain+')*',
- local_part = word+'(\\x2e'+word+')*',
- addr_spec = local_part+'\\x40'+domain,
- delim = '[,;\s\n]',
- reg1 = inline ? new RegExp('(^|<|'+delim+')'+addr_spec+'($|>|'+delim+')', 'i') : new RegExp('^'+addr_spec+'$', 'i');
-
+ var qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]';
+ var dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]';
+ var atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+';
+ var quoted_pair = '\\x5c[\\x00-\\x7f]';
+ var domain_literal = '\\x5b('+dtext+'|'+quoted_pair+')*\\x5d';
+ var quoted_string = '\\x22('+qtext+'|'+quoted_pair+')*\\x22';
+ var sub_domain = '('+atom+'|'+domain_literal+')';
+ var word = '('+atom+'|'+quoted_string+')';
+ var domain = sub_domain+'(\\x2e'+sub_domain+')*';
+ var local_part = word+'(\\x2e'+word+')*';
+ var addr_spec = local_part+'\\x40'+domain;
+ var delim = '[,;\s\n]';
+ var reg1 = inline ? new RegExp('(^|<|'+delim+')'+addr_spec+'($|>|'+delim+')', 'i') : new RegExp('^'+addr_spec+'$', 'i');
return reg1.test(input) ? true : false;
}
return false;
@@ -455,14 +505,14 @@
function rcube_clone_object(obj)
{
var out = {};
-
+
for (var key in obj) {
if (obj[key] && typeof obj[key] == 'object')
out[key] = clone_object(obj[key]);
else
out[key] = obj[key];
}
-
+
return out;
};
@@ -510,8 +560,8 @@
// determine whether the mouse is over the given object or not
function rcube_mouse_is_over(ev, obj)
{
- var mouse = rcube_event.get_mouse_pos(ev),
- pos = $(obj).offset();
+ var mouse = rcube_event.get_mouse_pos(ev);
+ var pos = $(obj).offset();
return ((mouse.x >= pos.left) && (mouse.x < (pos.left + obj.offsetWidth)) &&
(mouse.y >= pos.top) && (mouse.y < (pos.top + obj.offsetHeight)));
@@ -531,22 +581,18 @@
function getCookie(name)
{
- var dc = document.cookie,
- prefix = name + "=",
- end, begin = dc.indexOf("; " + prefix);
-
+ var dc = document.cookie;
+ var prefix = name + "=";
+ var begin = dc.indexOf("; " + prefix);
if (begin == -1) {
begin = dc.indexOf(prefix);
- if (begin != 0)
- return null;
+ if (begin != 0) return null;
}
else
begin += 2;
-
- end = document.cookie.indexOf(";", begin);
+ var end = document.cookie.indexOf(";", begin);
if (end == -1)
end = dc.length;
-
return unescape(dc.substring(begin + prefix.length, end));
};
@@ -584,6 +630,8 @@
};
var bw = new roundcube_browser();
+bw.set_html_class();
+
if (!window.console)
console = new rcube_console();
@@ -610,4 +658,4 @@
return obj;
}
-};
+}
--
Gitblit v1.9.1