extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix replies to encrypted mails dont open with encryption switched on

Browse Source
This commit is contained in:
Ralf Becker 2015-05-26 15:25:54 +00:00
parent db180f816d
commit d384f2407a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/js/app.js
View File

@ -4263,7 +4263,7 @@ app.classes.mail = AppJS.extend(
.removeClass('mailCompose_copyEmail') .removeClass('mailCompose_copyEmail')
.css('cursor','move'); .css('cursor','move');
} }
var dragItems = jQuery('div.ms-sel-item'); var dragItems = jQuery('div.ms-sel-item');
dragItems.each(function(i,item){ dragItems.each(function(i,item){
var $isErr = jQuery(item).find('.ui-state-error'); var $isErr = jQuery(item).find('.ui-state-error');
@ -4457,7 +4457,7 @@ app.classes.mail = AppJS.extend(
}; };
// set encrypted checkbox, if not already set // set encrypted checkbox, if not already set
var composeToolbar = this.et2.getWidgetById('composeToolbar'); var composeToolbar = this.et2.getWidgetById('composeToolbar');
if (composeToolbar.checkbox('pgp')) if (!composeToolbar.checkbox('pgp'))
{ {
composeToolbar.checkbox('pgp',true); composeToolbar.checkbox('pgp',true);
} }

2
phpgwapi/js/jsapi/app_base.js
View File

@ -865,7 +865,7 @@ var AppJS = Class.extend(
{ {
jQuery(window).on('mailvelope', function() jQuery(window).on('mailvelope', function()
{ {
self.mailvelopeOpenKeyring.then(callback); self.mailvelopeOpenKeyring().then(callback);
}); });
} }
}, },