From e23b1d913c3456bfa07d2590bca6410c3c8a33d5 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 03 May 2011 12:33:19 -0400
Subject: [PATCH] - Fix mozilla browser detection
---
program/js/common.js | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/program/js/common.js b/program/js/common.js
index 5730e4e..79832be 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -55,16 +55,13 @@
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.chrome = (this.agent_lc.indexOf('chrome') > 0);
this.safari = (!this.chrome && (this.agent_lc.indexOf('safari') > 0 || this.agent_lc.indexOf('applewebkit') > 0));
+ this.mz = (this.dom && !this.ie && !this.ns && !this.chrome && !this.safari && this.agent.indexOf('Mozilla') >= 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;
if (this.opera && window.RegExp)
@@ -81,7 +78,7 @@
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}\)/.test(this.agent_lc)))
+ 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);
@@ -129,10 +126,6 @@
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;
@@ -493,8 +486,8 @@
// 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+')',
- // allow punycode in last domain part for ICANN test domains
- domain = '([^@\\x2e]+\\x2e)+([a-z]{2,}|xn--[a-z0-9]{2,})',
+ // allow punycode/unicode top-level domain
+ domain = '([^@\\x2e]+\\x2e)+([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,})',
// ICANN e-mail test (http://idn.icann.org/E-mail_test)
icann_domains = [
'\\u0645\\u062b\\u0627\\u0644\\x2e\\u0625\\u062e\\u062a\\u0628\\u0627\\u0631',
@@ -582,8 +575,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);
- var pos = $(obj).offset();
+ var mouse = rcube_event.get_mouse_pos(ev),
+ pos = $(obj).offset();
return ((mouse.x >= pos.left) && (mouse.x < (pos.left + obj.offsetWidth)) &&
(mouse.y >= pos.top) && (mouse.y < (pos.top + obj.offsetHeight)));
@@ -603,18 +596,23 @@
function getCookie(name)
{
- var dc = document.cookie;
- var prefix = name + "=";
- var begin = dc.indexOf("; " + prefix);
+ var dc = document.cookie,
+ prefix = name + "=",
+ begin = dc.indexOf("; " + prefix);
+
if (begin == -1) {
begin = dc.indexOf(prefix);
- if (begin != 0) return null;
+ if (begin != 0)
+ return null;
}
- else
+ else {
begin += 2;
+ }
+
var end = document.cookie.indexOf(";", begin);
if (end == -1)
end = dc.length;
+
return unescape(dc.substring(begin + prefix.length, end));
};
@@ -634,7 +632,7 @@
else
msg += '\n--------------------------------------\n';
- // Konqueror doesn't allows to just change value of hidden element
+ // Konqueror doesn't allow to just change the value of hidden element
if (bw.konq) {
box.innerText += msg;
box.value = box.innerText;
@@ -653,9 +651,6 @@
var bw = new roundcube_browser();
bw.set_html_class();
-
-if (!window.console)
- console = new rcube_console();
// Add escape() method to RegExp object
--
Gitblit v1.9.1