diff options
Diffstat (limited to 'program/js/common.js')
-rw-r--r-- | program/js/common.js | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/program/js/common.js b/program/js/common.js index ee38c3528..5ac4febce 100644 --- a/program/js/common.js +++ b/program/js/common.js @@ -224,7 +224,7 @@ add_listener: function(p) p.element = document; if (!p.object._rc_events) - p.object._rc_events = []; + p.object._rc_events = {}; var key = p.event + '*' + p.method; if (!p.object._rc_events[key]) @@ -491,21 +491,25 @@ function urlencode(str) function rcube_find_object(id, d) { var n, f, obj, e; - if(!d) d = document; - if(d.getElementsByName && (e = d.getElementsByName(id))) + if (!d) d = document; + + if (d.getElementById) + if (obj = d.getElementById(id)) + return obj; + + if (!obj && d.getElementsByName && (e = d.getElementsByName(id))) obj = e[0]; - if(!obj && d.getElementById) - obj = d.getElementById(id); - if(!obj && d.all) + + if (!obj && d.all) obj = d.all[id]; - if(!obj && d.images.length) + if (!obj && d.images.length) obj = d.images[id]; if (!obj && d.forms.length) { for (f=0; f<d.forms.length; f++) { - if(d.forms[f].name == id) + if (d.forms[f].name == id) obj = d.forms[f]; else if(d.forms[f].elements[id]) obj = d.forms[f].elements[id]; @@ -513,7 +517,8 @@ function rcube_find_object(id, d) } if (!obj && d.layers) { - if (d.layers[id]) obj = d.layers[id]; + if (d.layers[id]) + obj = d.layers[id]; for (n=0; !obj && n<d.layers.length; n++) obj = rcube_find_object(id, d.layers[n].document); } @@ -527,8 +532,8 @@ function rcube_mouse_is_over(ev, obj) 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))); + return (mouse.x >= pos.left) && (mouse.x < (pos.left + obj.offsetWidth)) && + (mouse.y >= pos.top) && (mouse.y < (pos.top + obj.offsetHeight)); }; @@ -540,6 +545,7 @@ function setCookie(name, value, expires, path, domain, secure) (path ? "; path=" + path : "") + (domain ? "; domain=" + domain : "") + (secure ? "; secure" : ""); + document.cookie = curCookie; }; |