banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- code cleanup

Browse Source
release-0.6
alecpl 15 years ago
parent edaf6a6cef
commit a4865adf44
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File

14
skins/default/functions.js
Unescape Escape View File

@ -13,7 +13,7 @@ function rcube_init_settings_tabs()
tab = '#settingstab' + (rcmail.env.action=='preferences' ? 'default' : (rcmail.env.action.indexOf('identity')>0 ? 'identities' : rcmail.env.action.replace(/\./g, ''))); tab = '#settingstab' + (rcmail.env.action=='preferences' ? 'default' : (rcmail.env.action.indexOf('identity')>0 ? 'identities' : rcmail.env.action.replace(/\./g, '')));
$(tab).addClass('tablink-selected'); $(tab).addClass('tablink-selected');
$(tab + '> a').removeAttr('onclick').unbind('click').bind('click', function(){return false}); $(tab + '> a').removeAttr('onclick').unbind('click').bind('click', function(){return false;});
} }
function rcube_show_advanced(visible) function rcube_show_advanced(visible)
@ -39,12 +39,12 @@ function rcmail_show_header_form(id)
link.style.display = 'none'; link.style.display = 'none';
if (row = document.getElementById('compose-' + id)) if ((row = document.getElementById('compose-' + id)))
{ {
var div = document.getElementById('compose-div'); var div = document.getElementById('compose-div');
var headers_div = document.getElementById('compose-headers-div'); var headers_div = document.getElementById('compose-headers-div');
row.style.display = (document.all && !window.opera) ? 'block' : 'table-row'; row.style.display = (document.all && !window.opera) ? 'block' : 'table-row';
div.style.top = (parseInt(headers_div.offsetHeight)) + 'px'; div.style.top = parseInt(headers_div.offsetHeight, 10) + 'px';
} }
return false; return false;
@ -52,7 +52,7 @@ function rcmail_show_header_form(id)
function rcmail_hide_header_form(id) function rcmail_hide_header_form(id)
{ {
var row, parent, ns, ps, link, links; var row, parent, ns, link, links;
link = document.getElementById(id + '-link'); link = document.getElementById(id + '-link');
link.style.display = ''; link.style.display = '';
@ -71,12 +71,12 @@ function rcmail_hide_header_form(id)
document.getElementById('_' + id).value = ''; document.getElementById('_' + id).value = '';
if (row = document.getElementById('compose-' + id)) if ((row = document.getElementById('compose-' + id)))
{ {
var div = document.getElementById('compose-div'); var div = document.getElementById('compose-div');
var headers_div = document.getElementById('compose-headers-div'); var headers_div = document.getElementById('compose-headers-div');
row.style.display = 'none'; row.style.display = 'none';
div.style.top = (parseInt(headers_div.offsetHeight)) + 'px'; div.style.top = parseInt(headers_div.offsetHeight, 10) + 'px';
} }
return false; return false;
@ -175,7 +175,7 @@ show_searchmenu: function(show)
set_searchmod: function(elem) set_searchmod: function(elem)
{ {
if (!rcmail.env.search_mods) if (!rcmail.env.search_mods)
rcmail.env.search_mods = new Object(); rcmail.env.search_mods = {};
if (!rcmail.env.search_mods[rcmail.env.mailbox]) if (!rcmail.env.search_mods[rcmail.env.mailbox])
rcmail.env.search_mods[rcmail.env.mailbox] = rcube_clone_object(rcmail.env.search_mods['*']); rcmail.env.search_mods[rcmail.env.mailbox] = rcube_clone_object(rcmail.env.search_mods['*']);

17
skins/default/splitter.js
Unescape Escape View File

@ -75,7 +75,7 @@ function rcube_splitter(attrib)
this.layer.move(this.layer.x, Math.round(this.pos - lh / 2 + 1)); this.layer.move(this.layer.x, Math.round(this.pos - lh / 2 + 1));
if (bw.ie) if (bw.ie)
{ {
var new_height = (parseInt(this.p2.parentNode.offsetHeight) - parseInt(this.p2.style.top) - (bw.ie8 ? 2 : 0)); var new_height = parseInt(this.p2.parentNode.offsetHeight, 10) - parseInt(this.p2.style.top, 10) - (bw.ie8 ? 2 : 0);
this.p2.style.height = (new_height > 0 ? new_height : 0) +'px'; this.p2.style.height = (new_height > 0 ? new_height : 0) +'px';
} }
} }
@ -85,7 +85,7 @@ function rcube_splitter(attrib)
this.p2.style.left = Math.ceil(this.pos + this.layer.width / 2) + 'px'; this.p2.style.left = Math.ceil(this.pos + this.layer.width / 2) + 'px';
this.layer.move(Math.round(this.pos - this.layer.width / 2 + 1), this.layer.y); this.layer.move(Math.round(this.pos - this.layer.width / 2 + 1), this.layer.y);
if (bw.ie) if (bw.ie)
this.p2.style.width = (parseInt(this.p2.parentNode.offsetWidth) - parseInt(this.p2.style.left))+'px'; this.p2.style.width = parseInt(this.p2.parentNode.offsetWidth, 10) - parseInt(this.p2.style.left, 10) + 'px';
} }
}; };
@ -124,14 +124,14 @@ function rcube_splitter(attrib)
// the position of each iframe when the event is received // the position of each iframe when the event is received
var s = this; var s = this;
var id = '#'+iframes[n].id; var id = '#'+iframes[n].id;
this.iframe_events[n] = function(e){ e._offset = $(id).offset(); return s.onDrag(e); } this.iframe_events[n] = function(e){ e._offset = $(id).offset(); return s.onDrag(e); };
if (iframedoc.addEventListener) if (iframedoc.addEventListener)
iframedoc.addEventListener('mousemove', this.iframe_events[n], false); iframedoc.addEventListener('mousemove', this.iframe_events[n], false);
else if (iframes[n].attachEvent) else if (iframes[n].attachEvent)
iframedoc.attachEvent('onmousemove', this.iframe_events[n]); iframedoc.attachEvent('onmousemove', this.iframe_events[n]);
else else
iframedoc['onmousemove'] = this.iframe_events[n]; iframedoc.onmousemove = this.iframe_events[n];
rcube_event.add_listener({element:iframedoc, event:'mouseup', object:this, method:'onDragStop'}); rcube_event.add_listener({element:iframedoc, event:'mouseup', object:this, method:'onDragStop'});
} }
@ -201,6 +201,7 @@ function rcube_splitter(attrib)
iframedoc = iframes[n].contentWindow.document; iframedoc = iframes[n].contentWindow.document;
else if (iframes[n].document) else if (iframes[n].document)
iframedoc = iframes[n].document; iframedoc = iframes[n].document;
if (iframedoc) if (iframedoc)
{ {
if (this.iframe_events[n]) { if (this.iframe_events[n]) {
@ -209,7 +210,7 @@ function rcube_splitter(attrib)
else if (iframedoc.detachEvent) else if (iframedoc.detachEvent)
iframedoc.detachEvent('onmousemove', this.iframe_events[n]); iframedoc.detachEvent('onmousemove', this.iframe_events[n]);
else else
iframedoc['onmousemove'] = null; iframedoc.onmousemove = null;
} }
rcube_event.remove_listener({element:iframedoc, event:'mouseup', object:this, method:'onDragStop'}); rcube_event.remove_listener({element:iframedoc, event:'mouseup', object:this, method:'onDragStop'});
@ -228,11 +229,11 @@ function rcube_splitter(attrib)
{ {
if (this.horizontal) if (this.horizontal)
{ {
var new_height = (parseInt(this.p2.parentNode.offsetHeight) - parseInt(this.p2.style.top) - (bw.ie8 ? 2 : 0)); var new_height = parseInt(this.p2.parentNode.offsetHeight, 10) - parseInt(this.p2.style.top, 10) - (bw.ie8 ? 2 : 0);
this.p2.style.height = (new_height > 0 ? new_height : 0) +'px'; this.p2.style.height = (new_height > 0 ? new_height : 0) +'px';
} }
else else
this.p2.style.width = (parseInt(this.p2.parentNode.offsetWidth) - parseInt(this.p2.style.left))+'px'; this.p2.style.width = parseInt(this.p2.parentNode.offsetWidth, 10) - parseInt(this.p2.style.left, 10) + 'px';
}; };
this.set_cookie = function() this.set_cookie = function()
@ -241,6 +242,6 @@ function rcube_splitter(attrib)
var exp = new Date(); var exp = new Date();
exp.setYear(exp.getFullYear() + 1); exp.setYear(exp.getFullYear() + 1);
bw.set_cookie(this.id, this.pos, exp); bw.set_cookie(this.id, this.pos, exp);
} };
} // end class rcube_splitter } // end class rcube_splitter

Write Preview
Loading…
Cancel
Save