From a1640053b9dbe7d8b3bd9421d74127da8e615ad2 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 29 Jul 2011 12:57:11 -0400
Subject: [PATCH] - Unify/add loading messages when "opening" a frame
---
program/js/app.js | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 1814bed..da445a3 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1880,9 +1880,7 @@
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
@@ -1915,6 +1913,12 @@
if (!show && this.busy)
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
@@ -3906,8 +3910,10 @@
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 @@
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 @@
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 @@
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);
}
};
--
Gitblit v1.9.1