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

(js) Fix navController access from md dialogs

pull/229/merge
Francis Lachapelle 2018-08-23 14:47:18 -04:00
parent db567d90cc
commit 326fa87176
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/Templates/MailerUI/UIxMailViewTemplate.wox
View File

@ -25,7 +25,7 @@
<md-icon>close</md-icon>
</md-button>
<md-button class="md-icon-button hide-gt-xs"
ng-hide="isPopup"
ng-hide="::isPopup"
label:aria-label="Close"
ng-click="viewer.close()">
<md-icon>close</md-icon>

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

@ -184,6 +184,8 @@
targetEvent: $event,
clickOutsideToClose: false,
escapeToClose: false,
scope: $scope,
preserveScope: true,
templateUrl: 'UIxMailEditor',
controller: 'MessageEditorController',
controllerAs: 'editor',

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

@ -237,8 +237,8 @@
/**
* @ngInject
*/
MessageEditorControllerPopup.$inject = ['$window', '$q', '$mdDialog', 'stateAccount', 'stateMessage'];
function MessageEditorControllerPopup($window, $q, $mdDialog, stateAccount, stateMessage) {
MessageEditorControllerPopup.$inject = ['$window', '$scope', '$q', '$mdDialog', 'stateAccount', 'stateMessage'];
function MessageEditorControllerPopup($window, $scope, $q, $mdDialog, stateAccount, stateMessage) {
var onCompleteDeferred = $q.defer();
$mdDialog
.show({
@ -246,6 +246,8 @@
disableParentScroll: false,
clickOutsideToClose: false,
escapeToClose: false,
scope: $scope,
preserveScope: true,
templateUrl: 'UIxMailEditor',
controller: 'MessageEditorController',
controllerAs: 'editor',

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

@ -285,6 +285,8 @@
targetEvent: $event,
clickOutsideToClose: false,
escapeToClose: false,
scope: $scope,
preserveScope: true,
templateUrl: 'UIxMailEditor',
controller: 'MessageEditorController',
controllerAs: 'editor',