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

fix error when switching encryption on for text mail, fix double signature when switching encryption off (by not doing a server round-trip)

Browse Source
This commit is contained in:
Ralf Becker 2015-05-26 16:19:28 +00:00
parent d384f2407a
commit f0da3a71f9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mail/js/app.js
View File

@ -4508,7 +4508,10 @@ app.classes.mail = AppJS.extend(
self.et2._inst.submit(); self.et2._inst.submit();
return; // ToDo: do that without reload return; // ToDo: do that without reload
} }
self.mailvelopeCompose(); self.mailvelopeOpenKeyring().then(function(_keyring)
{
self.mailvelopeCompose(_keyring);
});
}) })
.catch(function(_err) .catch(function(_err)
{ {
@ -4525,7 +4528,9 @@ app.classes.mail = AppJS.extend(
{ {
if (_button_id == et2_dialog.YES_BUTTON ) if (_button_id == et2_dialog.YES_BUTTON )
{ {
self.et2._inst.submit(); self.et2.getWidgetById('mimeType').set_readonly(false);
self.et2.getWidgetById('mail_plaintext').set_disabled(false);
jQuery('iframe[src^=chrome-extension]').remove();
} }
else else
{ {