From a9251be2f09fb5f18a85d201c67668c70980efe3 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 20 Apr 2011 15:11:10 -0400
Subject: [PATCH] Update to TinyMCE 3.4.2 to fix errors in IE9
---
program/js/common.js | 96 +++++++++++++++++++++++++++++------------------
1 files changed, 59 insertions(+), 37 deletions(-)
diff --git a/program/js/common.js b/program/js/common.js
index ff2ab92..5c91027 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,18 +25,20 @@
*/
function roundcube_browser()
{
- 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;
- 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.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);
@@ -58,7 +60,7 @@
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.toLowerCase().indexOf('applewebkit') > 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);
@@ -66,20 +68,20 @@
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;
+ 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\.]+)/i.test(this.agent)) ? parseFloat(RegExp.$1) : 0;
+ 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]+)/i.test(this.agent)) ? parseInt(RegExp.$2) : 0;
+ 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;
+ 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\.]+)/i.test(this.agent)) ? parseFloat(RegExp.$1) : 0;
+ 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);
@@ -87,7 +89,7 @@
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.cookies = n.cookieEnabled;
// test for XMLHTTP support
this.xmlhttp_test = function()
@@ -363,7 +365,7 @@
/**
- * RoundCube generic layer (floating box) class
+ * Roundcube generic layer (floating box) class
*
* @constructor
*/
@@ -482,21 +484,41 @@
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+')',
+ // allow punycode in last domain part for ICANN test domains
+ domain = '([^@\\x2e]+\\x2e)+([a-z]{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',
+ '\\u4f8b\\u5b50\\x2e\\u6d4b\\u8bd5',
+ '\\u4f8b\\u5b50\\x2e\\u6e2c\\u8a66',
+ '\\u03c0\\u03b1\\u03c1\\u03ac\\u03b4\\u03b5\\u03b9\\u03b3\\u03bc\\u03b1\\x2e\\u03b4\\u03bf\\u03ba\\u03b9\\u03bc\\u03ae',
+ '\\u0909\\u0926\\u093e\\u0939\\u0930\\u0923\\x2e\\u092a\\u0930\\u0940\\u0915\\u094d\\u0937\\u093e',
+ '\\u4f8b\\u3048\\x2e\\u30c6\\u30b9\\u30c8',
+ '\\uc2e4\\ub840\\x2e\\ud14c\\uc2a4\\ud2b8',
+ '\\u0645\\u062b\\u0627\\u0644\\x2e\\u0622\\u0632\\u0645\\u0627\\u06cc\\u0634\u06cc',
+ '\\u043f\\u0440\\u0438\\u043c\\u0435\\u0440\\x2e\\u0438\\u0441\\u043f\\u044b\\u0442\\u0430\\u043d\\u0438\\u0435',
+ '\\u0b89\\u0ba4\\u0bbe\\u0bb0\\u0ba3\\u0bae\\u0bcd\\x2e\\u0baa\\u0bb0\\u0bbf\\u0b9f\\u0bcd\\u0b9a\\u0bc8',
+ '\\u05d1\\u05f2\\u05b7\\u05e9\\u05e4\\u05bc\\u05d9\\u05dc\\x2e\\u05d8\\u05e2\\u05e1\\u05d8'
+ ],
+ icann_addr = 'mailtest\\x40('+icann_domains.join('|')+')',
+ word = '('+atom+'|'+quoted_string+')',
+ delim = '[,;\s\n]',
+ local_part = word+'(\\x2e'+word+')*',
+ addr_spec = '(('+local_part+'\\x40'+domain+')|('+icann_addr+'))',
+ reg1 = inline ? new RegExp('(^|<|'+delim+')'+addr_spec+'($|>|'+delim+')', 'i') : new RegExp('^'+addr_spec+'$', 'i');
+
return reg1.test(input) ? true : false;
}
+
return false;
};
--
Gitblit v1.9.1