github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-21 06:18:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Restoring lost modifications during the last merge...

Browse Source
This commit is contained in:
Antoine Nguyen
2012-02-02 14:30:12 +01:00
parent 2437d4371b
commit 7bd67eb55a
4 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/webmail/static/js/webmail.js
+6 -5
View File
@@ -544,11 +544,10 @@ var Webmail = new Class({
//wm_updatelisting(resp);
this.page_update(resp);
window.addEvent("resize", this.resize_window_callback.bind(this));
var editormode = resp.editor;
if (editormode == "html") {
window.addEvent("resize", this.resize_window_callback.bind(this));
var instance = CKEDITOR.instances[editorid];
if (instance) {
CKEDITOR.remove(instance);
@@ -584,12 +583,14 @@ var Webmail = new Class({
* Callback of the 'sendmail' action.
*/
sendmail_callback: function(evt) {
var link = evt.target;
evt.stop();
infobox.show(gettext("Sending..."), {
profile : "gray",
spinner : true
});
disable_link(this);
disable_link(link);
$("composemail").set("send", {
onSuccess: function(resp) {
resp = JSON.decode(resp);
@@ -603,10 +604,10 @@ var Webmail = new Class({
}
current_anchor.parse_string(resp.url, true).setparams(navparams);
current_anchor.update();
this.eliminate("editormode");
link.eliminate("editormode");
}.bind(this)
});
if (this.retrieve("editormode") == "html") {
if (link.retrieve("editormode") == "html") {
CKEDITOR.instances[editorid].updateElement();
}
$("composemail").send();