From 8fa9229d578a9c2f265b4e46278c3f5f4329baae Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 16 Apr 2010 09:46:54 -0400
Subject: [PATCH] - code formatting, cleanup and small improvements
---
program/js/common.js | 180 +++++++++++++++++++++++++----------------------------------
1 files changed, 77 insertions(+), 103 deletions(-)
diff --git a/program/js/common.js b/program/js/common.js
index 1fd10c2..69a2d57 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -21,10 +21,10 @@
/**
* Default browser check class
- * @construcotr
+ * @constructor
*/
function roundcube_browser()
- {
+{
this.ver = parseFloat(navigator.appVersion);
this.appver = navigator.appVersion;
this.agent = navigator.userAgent;
@@ -48,8 +48,9 @@
this.ie = (document.all) ? true : false;
this.ie4 = (this.ie && !this.dom);
this.ie5 = (this.dom && this.appver.indexOf('MSIE 5')>0);
- this.ie6 = (this.dom && this.appver.indexOf('MSIE 6')>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));
@@ -71,7 +72,6 @@
else if(this.konq && window.RegExp)
this.vendver = (/khtml\/([0-9\.]+)/i.test(this.agent)) ? 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)))
this.lang = RegExp.$1;
@@ -84,13 +84,12 @@
this.cookies = navigator.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;
return this.xmlhttp;
- }
}
+};
// static functions for DOM event handling
@@ -131,16 +130,14 @@
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)
- {
+ }
+ if (e) {
opcode += (e.ctrlKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
return opcode;
- }
+ }
},
/**
@@ -152,8 +149,7 @@
var mX = (e.pageX) ? e.pageX : e.clientX;
var mY = (e.pageY) ? e.pageY : e.clientY;
- if (document.body && document.all)
- {
+ if (document.body && document.all) {
mX += document.body.scrollLeft;
mY += document.body.scrollTop;
}
@@ -185,13 +181,12 @@
if (p.element.addEventListener)
p.element.addEventListener(p.event, p.object._rc_events[key], false);
- else if (p.element.attachEvent)
- {
+ else if (p.element.attachEvent) {
// IE allows multiple events with the same function to be applied to the same object
// forcibly detach the event, then attach
p.element.detachEvent('on'+p.event, p.object._rc_events[key]);
p.element.attachEvent('on'+p.event, p.object._rc_events[key]);
- }
+ }
else
p.element['on'+p.event] = p.object._rc_events[key];
},
@@ -240,7 +235,7 @@
function rcube_event_engine()
{
this._events = {};
-}
+};
rcube_event_engine.prototype = {
@@ -291,7 +286,7 @@
e = this;
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++) {
@@ -312,7 +307,7 @@
return ret;
}
-} // end rcube_event_engine.prototype
+}; // end rcube_event_engine.prototype
@@ -327,7 +322,7 @@
// 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;
@@ -339,22 +334,20 @@
obj = document.createElement('DIV');
- with(obj)
- {
+ with(obj) {
id = this.name;
- with(style)
- {
- position = 'absolute';
+ 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';
+ width = w.toString().match(/\%$/) ? w : w+'px';
if (h)
- height = h.toString().match(/\%$/) ? h : h+'px';
+ height = h.toString().match(/\%$/) ? h : h+'px';
if(z) zIndex = z;
- }
- }
+ }
+ }
if (parent)
parent.appendChild(obj);
@@ -362,18 +355,15 @@
document.body.appendChild(obj);
this.elm = obj;
- };
-
+ };
// 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)
return false;
@@ -392,63 +382,56 @@
// ********* layer object methods *********
-
// move the layer to a specific position
this.move = function(x, y)
- {
+ {
this.x = x;
this.y = y;
this.css.left = Math.round(this.x)+'px';
this.css.top = Math.round(this.y)+'px';
- }
+ };
// change the layers width and height
this.resize = function(w,h)
- {
+ {
this.css.width = w+'px';
this.css.height = h+'px';
this.width = w;
this.height = h;
- }
-
+ };
// show or hide the layer
this.show = function(a)
- {
- if(a==1)
- {
+ {
+ if(a == 1) {
this.css.visibility = 'visible';
this.visible = true;
- }
- else if(a==2)
- {
+ }
+ else if(a == 2) {
this.css.visibility = 'inherit';
this.visible = true;
- }
- else
- {
+ }
+ else {
this.css.visibility = 'hidden';
this.visible = false;
- }
}
-
+ };
// write new content into a Layer
this.write = function(cont)
- {
+ {
this.elm.innerHTML = cont;
- }
+ };
-}
+};
// check if input is a valid email address
// By Cal Henderson <cal@iamcal.com>
// http://code.iamcal.com/php/rfc822/
function rcube_check_email(input, inline)
- {
- if (input && window.RegExp)
- {
+{
+ 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]+';
@@ -463,38 +446,31 @@
var delim = '[,;\s\n]';
var reg1 = inline ? new RegExp('(^|<|'+delim+')'+addr_spec+'($|>|'+delim+')', 'i') : new RegExp('^'+addr_spec+'$', 'i');
return reg1.test(input) ? true : false;
- }
+ }
return false;
+};
+
+
+// recursively copy an object
+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];
}
-
-// find a value in a specific array and returns the index
-function find_in_array()
- {
- var args = find_in_array.arguments;
- if(!args.length) return -1;
-
- var haystack = typeof(args[0])=='object' ? args[0] : args.length>1 && typeof(args[1])=='object' ? args[1] : new Array();
- var needle = typeof(args[0])!='object' ? args[0] : args.length>1 && typeof(args[1])!='object' ? args[1] : '';
- var nocase = args.length==3 ? args[2] : false;
-
- if(!haystack.length) return -1;
-
- for(var i=0; i<haystack.length; i++)
- if(nocase && haystack[i].toLowerCase()==needle.toLowerCase())
- return i;
- else if(haystack[i]==needle)
- return i;
-
- return -1;
- }
-
+ return out;
+};
// make a string URL safe
function urlencode(str)
{
return window.encodeURIComponent ? encodeURIComponent(str) : escape(str);
-}
+};
// get any type of html objects by id/name
@@ -529,7 +505,7 @@
}
return obj;
-}
+};
// determine whether the mouse is over the given object or not
function rcube_mouse_is_over(ev, obj)
@@ -539,40 +515,38 @@
return ((mouse.x >= pos.left) && (mouse.x < (pos.left + obj.offsetWidth)) &&
(mouse.y >= pos.top) && (mouse.y < (pos.top + obj.offsetHeight)));
-}
+};
// cookie functions by GoogieSpell
function setCookie(name, value, expires, path, domain, secure)
- {
+{
var curCookie = name + "=" + escape(value) +
(expires ? "; expires=" + expires.toGMTString() : "") +
(path ? "; path=" + path : "") +
(domain ? "; domain=" + domain : "") +
(secure ? "; secure" : "");
document.cookie = curCookie;
- }
-
-roundcube_browser.prototype.set_cookie = setCookie;
+};
function getCookie(name)
- {
+{
var dc = document.cookie;
var prefix = name + "=";
var begin = dc.indexOf("; " + prefix);
- if (begin == -1)
- {
+ if (begin == -1) {
begin = dc.indexOf(prefix);
if (begin != 0) return null;
- }
+ }
else
begin += 2;
var end = document.cookie.indexOf(";", begin);
if (end == -1)
end = dc.length;
return unescape(dc.substring(begin + prefix.length, end));
- }
+};
+roundcube_browser.prototype.set_cookie = setCookie;
roundcube_browser.prototype.get_cookie = getCookie;
// tiny replacement for Firebox functionality
@@ -580,7 +554,7 @@
{
this.log = function(msg)
{
- var box = rcube_find_object('console');
+ var box = rcube_find_object('dbgconsole');
if (box) {
if (msg.charAt(msg.length-1)=='\n')
@@ -599,11 +573,11 @@
this.reset = function()
{
- var box = rcube_find_object('console');
+ var box = rcube_find_object('dbgconsole');
if (box)
box.innerText = box.value = '';
};
-}
+};
var bw = new roundcube_browser();
if (!window.console)
@@ -613,17 +587,17 @@
// Add escape() method to RegExp object
// http://dev.rubyonrails.org/changeset/7271
RegExp.escape = function(str)
- {
+{
return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
- }
+};
// Make getElementById() case-sensitive on IE
if (bw.ie)
- {
+{
document._getElementById = document.getElementById;
document.getElementById = function(id)
- {
+ {
var i = 0;
var o = document._getElementById(id);
@@ -632,5 +606,5 @@
i++;
return o;
- }
}
+};
--
Gitblit v1.9.1