holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix open compose windows created new drafts after main window was reloaded

Browse Source
This commit is contained in:
nathan 2022-10-05 14:30:43 -06:00
parent 3ce5aebe12
commit ec388c955a
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/jsapi/egw.js
View File

@ -488,8 +488,7 @@ window.egw_rejoin = function ()
{ {
opener.addEventListener("load", () => opener.addEventListener("load", () =>
{ {
/* It takes more than just re-setting this.framework to get things working again /* It takes more than just re-setting this.framework to get everything working again, but this helps */
let reconnecting = egw(this).message("Reconnecting..."); let reconnecting = egw(this).message("Reconnecting...");
window.setTimeout(() => window.setTimeout(() =>
{ {
@ -499,7 +498,6 @@ window.egw_rejoin = function ()
this.framework = this.opener.framework; this.framework = this.opener.framework;
this.framework.egw_appWindow().console.log("Popup %s rejoined", this.location.href); this.framework.egw_appWindow().console.log("Popup %s rejoined", this.location.href);
}, 5000); }, 5000);
*/
}); });
}.bind(window), 500); }.bind(window), 500);
} }

7
mail/js/app.js
View File

@ -3906,9 +3906,10 @@ app.classes.mail = AppJS.extend(
} }
else else
{ {
// Send request through framework main window, so it works even if the main window is reloaded
self.egw.json('mail.mail_compose.ajax_saveAsDraft',[content, action],function(_data){ framework.egw_appWindow().egw.json('mail.mail_compose.ajax_saveAsDraft', [content, action], function (_data)
var res = self.savingDraft_response(_data,action); {
var res = self.savingDraft_response(_data, action);
if (res) if (res)
{ {
_resolve(); _resolve();