- Small optimisations

pull/1/head
alecpl 13 years ago
parent e7c445bea0
commit d65dd9cbe8

@ -1380,12 +1380,8 @@ function rcube_webmail()
this.collapse_folder = function(name) this.collapse_folder = function(name)
{ {
var li = this.get_folder_li(name, '', true), var li = this.get_folder_li(name, '', true),
div = $(li.getElementsByTagName('div')[0]); div = $('div:first', li),
ul = $('ul:first', li);
if (!div || (!div.hasClass('collapsed') && !div.hasClass('expanded')))
return;
var ul = $(li.getElementsByTagName('ul')[0]);
if (div.hasClass('collapsed')) { if (div.hasClass('collapsed')) {
ul.show(); ul.show();
@ -1393,7 +1389,7 @@ function rcube_webmail()
var reg = new RegExp('&'+urlencode(name)+'&'); var reg = new RegExp('&'+urlencode(name)+'&');
this.env.collapsed_folders = this.env.collapsed_folders.replace(reg, ''); this.env.collapsed_folders = this.env.collapsed_folders.replace(reg, '');
} }
else { else if (div.hasClass('expanded')) {
ul.hide(); ul.hide();
div.removeClass('expanded').addClass('collapsed'); div.removeClass('expanded').addClass('collapsed');
this.env.collapsed_folders = this.env.collapsed_folders+'&'+urlencode(name)+'&'; this.env.collapsed_folders = this.env.collapsed_folders+'&'+urlencode(name)+'&';
@ -1402,6 +1398,8 @@ function rcube_webmail()
if (this.env.mailbox.indexOf(name + this.env.delimiter) == 0) if (this.env.mailbox.indexOf(name + this.env.delimiter) == 0)
this.command('list', name); this.command('list', name);
} }
else
return;
// Work around a bug in IE6 and IE7, see #1485309 // Work around a bug in IE6 and IE7, see #1485309
if (bw.ie6 || bw.ie7) { if (bw.ie6 || bw.ie7) {

Loading…
Cancel
Save