summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-07-29 16:57:11 +0000
committeralecpl <alec@alec.pl>2011-07-29 16:57:11 +0000
commita1640053b9dbe7d8b3bd9421d74127da8e615ad2 (patch)
tree0c8bf36acf5dee4be99063c003bdc10df4086a1b /program
parentf9e2858ae11e93b90e5adbaaa308891e05a65111 (diff)
- Unify/add loading messages when "opening" a frame
Diffstat (limited to 'program')
-rw-r--r--program/js/app.js22
1 files changed, 14 insertions, 8 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 1814bedf2..da445a39c 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1880,9 +1880,7 @@ function rcube_webmail()
if (action == 'preview' && String(target.location.href).indexOf(url) >= 0)
this.show_contentframe(true);
else {
- if (!this.env.frame_lock) {
- (this.is_framed() ? parent.rcmail : this).env.frame_lock = this.set_busy(true, 'loading');
- }
+ this.lock_frame();
this.location_href(this.env.comm_path+url, target);
// mark as read and change mbox unread counter
@@ -1917,6 +1915,12 @@ function rcube_webmail()
this.set_busy(false, null, this.env.frame_lock);
};
+ this.lock_frame = function()
+ {
+ if (!this.env.frame_lock)
+ (this.is_framed() ? parent.rcmail : this).env.frame_lock = this.set_busy(true, 'loading');
+ };
+
// list a specific page
this.list_page = function(page)
{
@@ -3906,8 +3910,10 @@ function rcube_webmail()
if (this.env.group)
add_url += '&_gid='+urlencode(this.env.group);
- this.set_busy(true);
- this.location_href(this.env.comm_path+'&_action='+action+'&_source='+urlencode(this.env.source)+'&_cid='+urlencode(cid) + add_url, target);
+ this.lock_frame();
+ this.location_href(this.env.comm_path+'&_action='+action
+ +'&_source='+urlencode(this.env.source)
+ +'&_cid='+urlencode(cid) + add_url, target);
}
return true;
};
@@ -4427,6 +4433,7 @@ function rcube_webmail()
this.contact_list.clear_selection();
}
+ this.lock_frame();
this.location_href(this.env.comm_path+'&_action=search'+add_url, target);
return true;
@@ -4460,6 +4467,7 @@ function rcube_webmail()
add_url = '&_framed=1';
target = window.frames[this.env.contentframe];
}
+ this.lock_frame();
this.location_href(this.env.comm_path+'&_action=edit-prefs&_section='+id+add_url, target);
}
@@ -4861,9 +4869,7 @@ function rcube_webmail()
this.show_contentframe(true);
}
else {
- if (!this.env.frame_lock) {
- (parent.rcmail ? parent.rcmail : this).env.frame_lock = this.set_busy(true, 'loading');
- }
+ this.lock_frame();
this.location_href(this.env.comm_path+url, target);
}
};