From 9efa95ea9b51cec0a12502455e9c27e64e3aae14 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 27 Feb 2012 07:12:41 -0500
Subject: [PATCH] Better manual upgrading instructions: rsync plugins and skins to keep manually installed stuff
---
program/js/common.js | 267 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 194 insertions(+), 73 deletions(-)
diff --git a/program/js/common.js b/program/js/common.js
index 3a8739b..eb9a3c6 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -3,8 +3,11 @@
| Roundcube common js library |
| |
| This file is part of the Roundcube web development suite |
- | Copyright (C) 2005-2007, Roundcube Dev, - Switzerland |
- | Licensed under the GNU GPL |
+ | Copyright (C) 2005-2012, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
@@ -52,19 +55,17 @@
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.ie9 = (this.dom && this.appver.indexOf('MSIE 9')>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.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 +82,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);
@@ -105,34 +106,23 @@
{
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';
- }
+ if (this.ie)
+ classname += ' ie ie'+parseInt(this.vendver);
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)
+ else if (this.chrome)
+ classname += ' chrome';
+
+ if (this.iphone)
classname += ' iphone';
else if (this.ipad)
classname += ' ipad';
- else if (this.ns6)
- classname += ' netscape6';
- else if (this.ns7)
- classname += ' netscape7';
+ else if (this.safari || this.chrome)
+ classname += ' webkit';
if (document.documentElement)
document.documentElement.className += classname;
@@ -167,7 +157,7 @@
get_button: function(e)
{
e = e || window.event;
- return e && (typeof e.button != 'undefined') ? e.button : (e && e.which ? e.which : 0);
+ return e && e.button !== undefined ? e.button : (e && e.which ? e.which : 0);
},
/**
@@ -178,14 +168,12 @@
var opcode = 0;
e = e || window.event;
- if (bw.mac && e) {
+ if (bw.mac && e)
opcode += (e.metaKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
- return opcode;
- }
- if (e) {
+ else if (e)
opcode += (e.ctrlKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
- return opcode;
- }
+
+ return opcode;
},
/**
@@ -318,7 +306,7 @@
*/
removeEventListener: function(evt, func, obj)
{
- if (typeof obj == 'undefined')
+ if (obj === undefined)
obj = window;
for (var h,i=0; this._events && this._events[evt] && i < this._events[evt].length; i++)
@@ -335,28 +323,45 @@
triggerEvent: function(evt, e)
{
var ret, h;
- if (typeof e == 'undefined')
+ if (e === undefined)
e = this;
- else if (typeof e == 'object')
+ else if (typeof e === 'object')
e.event = evt;
if (this._events && this._events[evt] && !this._event_exec) {
this._event_exec = true;
for (var i=0; i < this._events[evt].length; i++) {
if ((h = this._events[evt][i])) {
- if (typeof h.func == 'function')
+ if (typeof h.func === 'function')
ret = h.func.call ? h.func.call(h.obj, e) : h.func(e);
- else if (typeof h.obj[h.func] == 'function')
+ else if (typeof h.obj[h.func] === 'function')
ret = h.obj[h.func](e);
// cancel event execution
- if (typeof ret != 'undefined' && !ret)
+ if (ret !== undefined && !ret)
break;
+ }
+ }
+ if (ret && ret.event) {
+ try {
+ delete ret.event;
+ } catch (err) {
+ // IE6-7 doesn't support deleting HTMLFormElement attributes (#1488017)
+ $(ret).removeAttr('event');
}
}
}
this._event_exec = false;
+ if (e.event) {
+ try {
+ delete e.event;
+ } catch (err) {
+ // IE6-7 doesn't support deleting HTMLFormElement attributes (#1488017)
+ $(e).removeAttr('event');
+ }
+ }
+
return ret;
}
@@ -385,21 +390,17 @@
parent = arg.parent,
obj = document.createElement('DIV');
- with (obj) {
- id = this.name;
- with (style) {
- position = 'absolute';
- visibility = (vis) ? (vis==2) ? 'inherit' : 'visible' : 'hidden';
- left = l+'px';
- top = t+'px';
- if (w)
- width = w.toString().match(/\%$/) ? w : w+'px';
- if (h)
- height = h.toString().match(/\%$/) ? h : h+'px';
- if (z)
- zIndex = z;
- }
- }
+ obj.id = this.name;
+ obj.style.position = 'absolute';
+ obj.style.visibility = (vis) ? (vis==2) ? 'inherit' : 'visible' : 'hidden';
+ obj.style.left = l+'px';
+ obj.style.top = t+'px';
+ if (w)
+ obj.style.width = w.toString().match(/\%$/) ? w : w+'px';
+ if (h)
+ obj.style.height = h.toString().match(/\%$/) ? h : h+'px';
+ if (z)
+ obj.style.zIndex = z;
if (parent)
parent.appendChild(obj);
@@ -491,14 +492,29 @@
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
- sub_domain = '[^@]+',
//domain_literal = '\\x5b('+dtext+'|'+quoted_pair+')*\\x5d',
//sub_domain = '('+atom+'|'+domain_literal+')',
+ // 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',
+ '\\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]',
- domain = sub_domain+'(\\x2e'+sub_domain+')*',
local_part = word+'(\\x2e'+word+')*',
- addr_spec = local_part+'\\x40'+domain,
+ 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;
@@ -514,7 +530,7 @@
var out = {};
for (var key in obj) {
- if (obj[key] && typeof obj[key] == 'object')
+ if (obj[key] && typeof obj[key] === 'object')
out[key] = clone_object(obj[key]);
else
out[key] = obj[key];
@@ -523,10 +539,17 @@
return out;
};
-// make a string URL safe
+// make a string URL safe (and compatible with PHP's rawurlencode())
function urlencode(str)
{
- return window.encodeURIComponent ? encodeURIComponent(str) : escape(str);
+ if (window.encodeURIComponent)
+ return encodeURIComponent(str).replace('*', '%2A');
+
+ return escape(str)
+ .replace('+', '%2B')
+ .replace('*', '%2A')
+ .replace('/', '%2F')
+ .replace('@', '%40');
};
@@ -567,8 +590,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)));
@@ -588,18 +611,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
- begin += 2;
- var end = document.cookie.indexOf(";", begin);
+ else {
+ begin += 2;
+ }
+
+ var end = dc.indexOf(";", begin);
if (end == -1)
end = dc.length;
+
return unescape(dc.substring(begin + prefix.length, end));
};
@@ -619,7 +647,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;
@@ -639,9 +667,6 @@
var bw = new roundcube_browser();
bw.set_html_class();
-if (!window.console)
- console = new rcube_console();
-
// Add escape() method to RegExp object
// http://dev.rubyonrails.org/changeset/7271
@@ -650,6 +675,23 @@
return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
};
+// Extend Date prototype to detect Standard timezone without DST
+// from http://www.michaelapproved.com/articles/timezone-detect-and-ignore-daylight-saving-time-dst/
+Date.prototype.getStdTimezoneOffset = function()
+{
+ var m = 12,
+ d = new Date(null, m, 1),
+ tzo = d.getTimezoneOffset();
+
+ while (--m) {
+ d.setUTCMonth(m);
+ if (tzo != d.getTimezoneOffset()) {
+ return Math.max(tzo, d.getTimezoneOffset());
+ }
+ }
+
+ return tzo;
+}
// Make getElementById() case-sensitive on IE
if (bw.ie)
@@ -666,3 +708,82 @@
return obj;
}
}
+
+// This code was written by Tyler Akins and has been placed in the
+// public domain. It would be nice if you left this header intact.
+// Base64 code from Tyler Akins -- http://rumkin.com
+var Base64 = (function () {
+ var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+
+ var obj = {
+ /**
+ * Encodes a string in base64
+ * @param {String} input The string to encode in base64.
+ */
+ encode: function (input) {
+ if (typeof(window.btoa) === 'function')
+ return btoa(input);
+
+ var chr1, chr2, chr3, enc1, enc2, enc3, enc4, i = 0, output = '', len = input.length;
+
+ do {
+ chr1 = input.charCodeAt(i++);
+ chr2 = input.charCodeAt(i++);
+ chr3 = input.charCodeAt(i++);
+
+ enc1 = chr1 >> 2;
+ enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+ enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+ enc4 = chr3 & 63;
+
+ if (isNaN(chr2))
+ enc3 = enc4 = 64;
+ else if (isNaN(chr3))
+ enc4 = 64;
+
+ output = output
+ + keyStr.charAt(enc1) + keyStr.charAt(enc2)
+ + keyStr.charAt(enc3) + keyStr.charAt(enc4);
+ } while (i < len);
+
+ return output;
+ },
+
+ /**
+ * Decodes a base64 string.
+ * @param {String} input The string to decode.
+ */
+ decode: function (input) {
+ if (typeof(window.atob) === 'function')
+ return atob(input);
+
+ var chr1, chr2, chr3, enc1, enc2, enc3, enc4, len, i = 0, output = '';
+
+ // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
+ input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+ len = input.length;
+
+ do {
+ enc1 = keyStr.indexOf(input.charAt(i++));
+ enc2 = keyStr.indexOf(input.charAt(i++));
+ enc3 = keyStr.indexOf(input.charAt(i++));
+ enc4 = keyStr.indexOf(input.charAt(i++));
+
+ chr1 = (enc1 << 2) | (enc2 >> 4);
+ chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+ chr3 = ((enc3 & 3) << 6) | enc4;
+
+ output = output + String.fromCharCode(chr1);
+
+ if (enc3 != 64)
+ output = output + String.fromCharCode(chr2);
+ if (enc4 != 64)
+ output = output + String.fromCharCode(chr3);
+ } while (i < len);
+
+ return output;
+ }
+ };
+
+ return obj;
+})();
--
Gitblit v1.9.1