X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fjs%2Fcommon.js.src;h=d2558ce88f0fa3e77ce4e4abaa130e4a217a3c19;hb=76507f7c63a660742e76889ad6e3919f3dde3bb0;hp=3c7b8c3730a46d9380d39d9550f135a0eb5eca4f;hpb=315a64971ff1249e4d5884f309fab5ddbfe55cc6;p=roundcube.git

diff --git a/program/js/common.js.src b/program/js/common.js.src
index 3c7b8c3..d2558ce 100644
--- a/program/js/common.js.src
+++ b/program/js/common.js.src
@@ -3,14 +3,14 @@
  | Roundcube common js library                                           |
  |                                                                       |
  | This file is part of the Roundcube web development suite              |
- | Copyright (C) 2005-2007, Roundcube Dev, - Switzerland                 |
+ | Copyright (C) 2005-2007, The Roundcube Dev Team                       |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
  
- $Id: common.js 4509 2011-02-09 10:51:50Z thomasb $
+ $Id: common.js 5481 2011-11-24 07:53:00Z alec $
 */
 
 // Constants
@@ -55,16 +55,13 @@ function roundcube_browser()
   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 @@ function roundcube_browser()
     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 @@ function roundcube_browser()
       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;
@@ -167,7 +160,7 @@ get_keycode: function(e)
 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 +171,12 @@ get_modifier: function(e)
   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 +309,7 @@ addEventListener: function(evt, func, obj)
  */
 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 +326,45 @@ removeEventListener: function(evt, func, obj)
 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 +393,17 @@ function rcube_layer(id, attributes)
       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);
@@ -493,8 +497,8 @@ function rcube_check_email(input, inline)
       // 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',
@@ -529,7 +533,7 @@ function rcube_clone_object(obj)
   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];
@@ -538,10 +542,17 @@ function rcube_clone_object(obj)
   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');
 };
 
 
@@ -582,8 +593,8 @@ function rcube_find_object(id, d)
 // 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 +614,23 @@ function setCookie(name, value, expires, path, domain, secure)
 
 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));
 };
 
@@ -634,7 +650,7 @@ function rcube_console()
       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;
@@ -654,9 +670,6 @@ function rcube_console()
 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
@@ -665,6 +678,23 @@ RegExp.escape = function(str)
   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)
@@ -681,3 +711,82 @@ if (bw.ie)
     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;
+})();