From 2c200021fdf9b5d1c73e39e7c46e7db1e4152e91 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 15 Nov 2010 04:26:24 -0500
Subject: [PATCH] - Fix focused elements aren't unfocused when clicking on the list (#1487123)
---
program/js/common.js | 235 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 146 insertions(+), 89 deletions(-)
diff --git a/program/js/common.js b/program/js/common.js
index 69a2d57..76ddd72 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -1,9 +1,9 @@
/*
+-----------------------------------------------------------------------+
- | RoundCube common js library |
+ | Roundcube common js library |
| |
- | This file is part of the RoundCube web development suite |
- | Copyright (C) 2005-2007, RoundCube Dev, - Switzerland |
+ | This file is part of the Roundcube web development suite |
+ | Copyright (C) 2005-2007, Roundcube Dev, - Switzerland |
| Licensed under the GNU GPL |
| |
+-----------------------------------------------------------------------+
@@ -25,70 +25,118 @@
*/
function roundcube_browser()
{
- this.ver = parseFloat(navigator.appVersion);
- this.appver = navigator.appVersion;
- this.agent = navigator.userAgent;
- this.name = navigator.appName;
- this.vendor = navigator.vendor ? navigator.vendor : '';
- this.vendver = navigator.vendorSub ? parseFloat(navigator.vendorSub) : 0;
- this.product = navigator.product ? navigator.product : '';
- this.platform = String(navigator.platform).toLowerCase();
- this.lang = (navigator.language) ? navigator.language.substring(0,2) :
- (navigator.browserLanguage) ? navigator.browserLanguage.substring(0,2) :
- (navigator.systemLanguage) ? navigator.systemLanguage.substring(0,2) : 'en';
+ var n = navigator;
- 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.ver = parseFloat(n.appVersion);
+ this.appver = n.appVersion;
+ this.agent = n.userAgent;
+ this.agent_lc = n.userAgent.toLowerCase();
+ this.name = n.appName;
+ this.vendor = n.vendor ? n.vendor : '';
+ this.vendver = n.vendorSub ? parseFloat(n.vendorSub) : 0;
+ this.product = n.product ? n.product : '';
+ this.platform = String(n.platform).toLowerCase();
+ this.lang = (n.language) ? n.language.substring(0,2) :
+ (n.browserLanguage) ? n.browserLanguage.substring(0,2) :
+ (n.systemLanguage) ? n.systemLanguage.substring(0,2) : 'en';
+
+ 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.chrome = (this.agent_lc.indexOf('chrome') > 0);
+ this.safari = (!this.chrome && (this.agent_lc.indexOf('safari') > 0 || this.agent_lc.indexOf('applewebkit') > 0));
+ this.konq = (this.agent_lc.indexOf('konqueror') > 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)
- this.vendver = (/opera(\s|\/)([0-9\.]+)/i.test(navigator.userAgent)) ? parseFloat(RegExp.$2) : -1;
- 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)
+ if (this.opera && window.RegExp)
+ this.vendver = (/opera(\s|\/)([0-9\.]+)/.test(this.agent_lc)) ? parseFloat(RegExp.$2) : -1;
+ else if (this.chrome && window.RegExp)
+ this.vendver = (/chrome\/([0-9\.]+)/.test(this.agent_lc)) ? parseFloat(RegExp.$1) : 0;
+ else if (!this.vendver && this.safari)
+ this.vendver = (/(safari|applewebkit)\/([0-9]+)/.test(this.agent_lc)) ? parseInt(RegExp.$2) : 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)
- this.vendver = (/msie\s+([0-9\.]+)/i.test(this.agent)) ? parseFloat(RegExp.$1) : 0;
- else if(this.konq && window.RegExp)
- this.vendver = (/khtml\/([0-9\.]+)/i.test(this.agent)) ? parseFloat(RegExp.$1) : 0;
+ else if (this.ie && window.RegExp)
+ this.vendver = (/msie\s+([0-9\.]+)/.test(this.agent_lc)) ? parseFloat(RegExp.$1) : 0;
+ else if (this.konq && window.RegExp)
+ this.vendver = (/khtml\/([0-9\.]+)/.test(this.agent_lc)) ? parseFloat(RegExp.$1) : 0;
// get real language out of safari's user agent
- if(this.safari && (/;\s+([a-z]{2})-[a-z]{2}\)/i.test(this.agent)))
+ if(this.safari && (/;\s+([a-z]{2})-[a-z]{2}\)/.test(this.agent_lc)))
this.lang = RegExp.$1;
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.cookies = navigator.cookieEnabled;
-
+ 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 = n.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 +180,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,8 +194,8 @@
get_mouse_pos: function(e)
{
if (!e) e = window.event;
- var mX = (e.pageX) ? e.pageX : e.clientX;
- var mY = (e.pageY) ? e.pageY : e.clientY;
+ var mX = (e.pageX) ? e.pageX : e.clientX,
+ mY = (e.pageY) ? e.pageY : e.clientY;
if (document.body && document.all) {
mX += document.body.scrollLeft;
@@ -174,7 +222,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); };
@@ -224,6 +272,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 };
}
};
@@ -252,7 +305,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;
},
@@ -267,7 +320,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;
@@ -295,7 +348,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;
@@ -312,31 +365,29 @@
/**
- * RoundCube generic layer (floating box) class
+ * Roundcube generic layer (floating box) class
*
* @constructor
*/
function rcube_layer(id, attributes)
{
this.name = id;
-
+
// create a new layer in the current document
this.create = function(arg)
{
- var l = (arg.x) ? arg.x : 0;
- var t = (arg.y) ? arg.y : 0;
- var w = arg.width;
- var h = arg.height;
- var z = arg.zindex;
- var vis = arg.vis;
- var parent = arg.parent;
- var obj;
+ var l = (arg.x) ? arg.x : 0,
+ t = (arg.y) ? arg.y : 0,
+ w = arg.width,
+ h = arg.height,
+ z = arg.zindex,
+ vis = arg.vis,
+ parent = arg.parent,
+ obj = document.createElement('DIV');
- obj = document.createElement('DIV');
-
- with(obj) {
+ with (obj) {
id = this.name;
- with(style) {
+ with (style) {
position = 'absolute';
visibility = (vis) ? (vis==2) ? 'inherit' : 'visible' : 'hidden';
left = l+'px';
@@ -345,7 +396,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;
}
}
@@ -358,14 +410,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;
@@ -432,21 +484,25 @@
function rcube_check_email(input, inline)
{
if (input && window.RegExp) {
- 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');
+ 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]',
+ quoted_string = '\\x22('+qtext+'|'+quoted_pair+')*\\x22',
+ // Use simplified domain matching, because we need to allow Unicode characters here
+ // So, e-mail address should be validated also on server side after idn_to_ascii() use
+ //domain_literal = '\\x5b('+dtext+'|'+quoted_pair+')*\\x5d',
+ //sub_domain = '('+atom+'|'+domain_literal+')',
+ domain = '([^@\\x2e]+\\x2e)+[a-z]{2,}',
+ word = '('+atom+'|'+quoted_string+')',
+ delim = '[,;\s\n]',
+ local_part = word+'(\\x2e'+word+')*',
+ addr_spec = local_part+'\\x40'+domain,
+ reg1 = inline ? new RegExp('(^|<|'+delim+')'+addr_spec+'($|>|'+delim+')', 'i') : new RegExp('^'+addr_spec+'$', 'i');
+
return reg1.test(input) ? true : false;
}
+
return false;
};
@@ -455,14 +511,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;
};
@@ -580,6 +636,8 @@
};
var bw = new roundcube_browser();
+bw.set_html_class();
+
if (!window.console)
console = new rcube_console();
@@ -598,13 +656,12 @@
document._getElementById = document.getElementById;
document.getElementById = function(id)
{
- var i = 0;
- var o = document._getElementById(id);
+ var i = 0, obj = document._getElementById(id);
- if (!o || o.id != id)
- while ((o = document.all[i]) && o.id != id)
+ if (obj && obj.id != id)
+ while ((obj = document.all[i]) && obj.id != id)
i++;
- return o;
+ return obj;
}
-};
+}
--
Gitblit v1.9.1