LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix popup window detection in message viewer 

Fixes #4518
pull/229/merge
Francis Lachapelle 2018-09-12 16:21:00 -04:00
parent ff7e8cb2a3
commit ec4d93a845
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -14,6 +14,7 @@ Bug fixes
- [web] fixed display of notification email in calendar properties
- [web] fixed display of multi-days events when some weekdays are disabled
- [web] fixed synchronisation of calendar categories
- [web] fixed popup window detection in message viewer (#4518)
4.0.2 (2018-08-24)
------------------

3
UI/WebServerResources/js/Mailer/MailboxController.js
View File

@ -184,8 +184,6 @@
targetEvent: $event,
clickOutsideToClose: false,
escapeToClose: false,
scope: $scope,
preserveScope: true,
templateUrl: 'UIxMailEditor',
controller: 'MessageEditorController',
controllerAs: 'editor',
@ -193,6 +191,7 @@
return onCompleteDeferred.resolve(element);
},
locals: {
stateParent: $scope,
stateAccount: vm.account,
stateMessage: message,
onCompletePromise: function () {

3
UI/WebServerResources/js/Mailer/Mailer.popup.js
View File

@ -246,8 +246,6 @@
disableParentScroll: false,
clickOutsideToClose: false,
escapeToClose: false,
scope: $scope,
preserveScope: true,
templateUrl: 'UIxMailEditor',
controller: 'MessageEditorController',
controllerAs: 'editor',
@ -255,6 +253,7 @@
return onCompleteDeferred.resolve(element);
},
locals: {
stateParent: $scope,
stateAccount: stateAccount,
stateMessage: stateMessage,
onCompletePromise: function () {

3
UI/WebServerResources/js/Mailer/MessageController.js
View File

@ -285,8 +285,6 @@
targetEvent: $event,
clickOutsideToClose: false,
escapeToClose: false,
scope: $scope,
preserveScope: true,
templateUrl: 'UIxMailEditor',
controller: 'MessageEditorController',
controllerAs: 'editor',
@ -294,6 +292,7 @@
return onCompleteDeferred.resolve(element);
},
locals: {
stateParent: $scope,
stateAccount: vm.account,
stateMessage: message,
onCompletePromise: function () {

5
UI/WebServerResources/js/Mailer/MessageEditorController.js
View File

@ -6,11 +6,12 @@
/**
* @ngInject
*/
MessageEditorController.$inject = ['$scope', '$window', '$stateParams', '$mdConstant', '$mdUtil', '$mdDialog', '$mdToast', 'FileUploader', 'stateAccount', 'stateMessage', 'onCompletePromise', 'encodeUriFilter', '$timeout', 'sgFocus', 'Dialog', 'AddressBook', 'Card', 'Preferences'];
function MessageEditorController($scope, $window, $stateParams, $mdConstant, $mdUtil, $mdDialog, $mdToast, FileUploader, stateAccount, stateMessage, onCompletePromise, encodeUriFilter, $timeout, focus, Dialog, AddressBook, Card, Preferences) {
MessageEditorController.$inject = ['$scope', '$window', '$stateParams', '$mdConstant', '$mdUtil', '$mdDialog', '$mdToast', 'FileUploader', 'stateParent', 'stateAccount', 'stateMessage', 'onCompletePromise', 'encodeUriFilter', '$timeout', 'sgFocus', 'Dialog', 'AddressBook', 'Card', 'Preferences'];
function MessageEditorController($scope, $window, $stateParams, $mdConstant, $mdUtil, $mdDialog, $mdToast, FileUploader, stateParent, stateAccount, stateMessage, onCompletePromise, encodeUriFilter, $timeout, focus, Dialog, AddressBook, Card, Preferences) {
var vm = this;
this.$onInit = function() {
$scope.isPopup = stateParent.isPopup;
vm.addRecipient = addRecipient;
vm.autocomplete = {to: {}, cc: {}, bcc: {}};
vm.autosave = null;