amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-12 15:05:29 +00:00
Code Issues Projects Releases Wiki Activity

(js) Compose new message in a popup window

Browse Source
This commit is contained in:
Francis Lachapelle
2017-01-19 12:23:55 -05:00
parent 4fca484ed0
commit d7d88e2620
7 changed files with 101 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Mailer/MailboxController.js
+49 -22
View File
@@ -6,8 +6,8 @@
/**
* @ngInject
*/
MailboxController.$inject = ['$window', '$scope', '$timeout', '$q', '$state', '$mdDialog', '$mdToast', 'stateAccounts', 'stateAccount', 'stateMailbox', 'sgHotkeys', 'encodeUriFilter', 'sgFocus', 'Dialog', 'Account', 'Mailbox'];
function MailboxController($window, $scope, $timeout, $q, $state, $mdDialog, $mdToast, stateAccounts, stateAccount, stateMailbox, sgHotkeys, encodeUriFilter, focus, Dialog, Account, Mailbox) {
MailboxController.$inject = ['$window', '$scope', '$timeout', '$q', '$state', '$mdDialog', '$mdToast', 'stateAccounts', 'stateAccount', 'stateMailbox', 'sgHotkeys', 'encodeUriFilter', 'sgSettings', 'sgFocus', 'Dialog', 'Account', 'Mailbox'];
function MailboxController($window, $scope, $timeout, $q, $state, $mdDialog, $mdToast, stateAccounts, stateAccount, stateMailbox, sgHotkeys, encodeUriFilter, sgSettings, focus, Dialog, Account, Mailbox) {
var vm = this,
defaultWindowTitle = angular.element($window.document).find('title').attr('sg-default') || "SOGo",
hotkeys = [];
@@ -156,32 +156,59 @@
});
}
function newMessage($event) {
function newMessage($event, inPopup) {
var message;
if (vm.messageDialog === null) {
message = vm.account.$newMessage();
vm.messageDialog = $mdDialog
.show({
parent: angular.element(document.body),
targetEvent: $event,
clickOutsideToClose: false,
escapeToClose: false,
templateUrl: 'UIxMailEditor',
controller: 'MessageEditorController',
controllerAs: 'editor',
locals: {
stateAccount: vm.account,
stateMessage: message,
stateRecipients: []
}
})
.finally(function() {
vm.messageDialog = null;
});
if (inPopup)
_newMessageInPopup();
else {
message = vm.account.$newMessage();
vm.messageDialog = $mdDialog
.show({
parent: angular.element(document.body),
targetEvent: $event,
clickOutsideToClose: false,
escapeToClose: false,
templateUrl: 'UIxMailEditor',
controller: 'MessageEditorController',
controllerAs: 'editor',
locals: {
stateAccount: vm.account,
stateMessage: message
}
})
.finally(function() {
vm.messageDialog = null;
});
}
}
}
function _newMessageInPopup() {
var url = [sgSettings.baseURL(),
'UIxMailPopupView#!/Mail',
vm.account.id,
// The double-encoding is necessary
encodeUriFilter(encodeUriFilter(vm.selectedFolder.path)),
'new']
.join('/'),
wId = vm.selectedFolder.$id() + '/' + Math.random(0, 1000);
console.debug(url);
$window.open(url, wId,
["width=680",
"height=520",
"resizable=1",
"scrollbars=1",
"toolbar=0",
"location=0",
"directories=0",
"status=0",
"menubar=0",
"copyhistory=0"]
.join(','));
}
/**
* User has pressed up arrow key
*/
UI/WebServerResources/js/Mailer/Mailer.popup.js
+4 -5
View File
@@ -215,8 +215,8 @@
/**
* @ngInject
*/
MessageEditorControllerPopup.$inject = ['$window', '$mdDialog', 'stateAccounts', 'stateMessage'];
function MessageEditorControllerPopup($window, $mdDialog, stateAccounts, stateMessage) {
MessageEditorControllerPopup.$inject = ['$window', '$mdDialog', 'stateAccount', 'stateMessage'];
function MessageEditorControllerPopup($window, $mdDialog, stateAccount, stateMessage) {
$mdDialog
.show({
hasBackdrop: false,
@@ -227,9 +227,8 @@
controller: 'MessageEditorController',
controllerAs: 'editor',
locals: {
stateAccounts: stateAccounts,
stateMessage: stateMessage,
stateRecipients: []
stateAccount: stateAccount,
stateMessage: stateMessage
}
})
.finally(function() {
UI/WebServerResources/js/Mailer/MessageController.js
+16 -16
View File
@@ -284,22 +284,22 @@
_messageDialog(
$mdDialog
.show({
parent: angular.element(document.body),
targetEvent: $event,
clickOutsideToClose: false,
escapeToClose: false,
templateUrl: 'UIxMailEditor',
controller: 'MessageEditorController',
controllerAs: 'editor',
locals: {
stateAccount: vm.account,
stateMessage: message
}
})
.finally(function() {
_messageDialog(null);
closePopup();
})
parent: angular.element(document.body),
targetEvent: $event,
clickOutsideToClose: false,
escapeToClose: false,
templateUrl: 'UIxMailEditor',
controller: 'MessageEditorController',
controllerAs: 'editor',
locals: {
stateAccount: vm.account,
stateMessage: message
}
})
.finally(function() {
_messageDialog(null);
closePopup();
})
);
}
}