Initial popup view for messages

2026-05-30 15:45:26 +00:00 · 2015-09-04 17:31:16 -04:00
parent bf02b3046f
commit 2720aebf04
10 changed files with 316 additions and 41 deletions
@@ -3,8 +3,9 @@
 (function() {
  'use strict';

-  angular.module('SOGo.Common', ['ngMaterial'])
+  angular.module('SOGo.Common', ['ngAnimate', 'ngMaterial'])
    .value('sgSettings', {
+      isPopup: document.body.classList.contains('popup'),
      baseURL: function() {
        return ApplicationBaseURL || null;
      },
@@ -12,6 +12,7 @@
  navController.$inject =  ['$scope', '$timeout', '$interval', '$http', '$mdSidenav', '$mdBottomSheet', '$mdMedia', '$log', 'sgConstant', 'sgSettings', 'Alarm'];
  function navController($scope, $timeout, $interval, $http, $mdSidenav, $mdBottomSheet, $mdMedia, $log, sgConstant, sgSettings, Alarm) {

+    $scope.isPopup = sgSettings.isPopup;
    $scope.activeUser = sgSettings.activeUser();
    $scope.baseURL = sgSettings.baseURL();

@@ -0,0 +1,215 @@
+/* -*- Mode: javascript; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* JavaScript for SOGo.MailerUI module */
+
+(function() {
+  'use strict';
+
+  angular.module('SOGo.MailerUI', ['ngSanitize', 'ui.router', 'ck', 'angularFileUpload', 'SOGo.Common', 'SOGo.ContactsUI', 'ngAnimate', 'SOGo.PreferencesUI'])
+    .config(configure)
+    .run(runBlock)
+    .controller('MessageEditorControllerPopup', MessageEditorControllerPopup);
+
+  /**
+   * @ngInject
+   */
+  configure.$inject = ['$stateProvider', '$urlRouterProvider'];
+  function configure($stateProvider, $urlRouterProvider) {
+    $stateProvider
+      .state('mail', {
+        url: '/Mail',
+        abstract: true,
+        views: {
+          message: {
+            template: '<ui-view/>'
+          }
+        },
+        resolve: {
+          stateAccounts: stateAccounts
+        }
+      })
+      .state('mail.account', {
+        url: '/:accountId',
+        abstract: true,
+        template: '<ui-view id="account"/>',
+        resolve: {
+          stateAccount: stateAccount
+        }
+      })
+      .state('mail.account.mailbox', {
+        url: '/:mailboxId',
+        abstract: true,
+        template: '<ui-view id="mailbox"/>',
+        resolve: {
+          stateMailbox: stateMailbox
+        }
+      })
+      .state('mail.account.mailbox.newMessage', {
+        url: '/new',
+        views: {
+          'message@': {
+            template: '<ui-view/>',
+            controller: 'MessageEditorControllerPopup'
+          }
+        },
+        resolve: {
+          stateMessage: stateNewMessage
+        }
+      })
+      .state('mail.account.mailbox.message', {
+        url: '/:messageId',
+        views: {
+          'message@': {
+            templateUrl: 'UIxMailViewTemplate', // UI/Templates/MailerUI/UIxMailViewTemplate.wox
+            controller: 'MessageController',
+            controllerAs: 'viewer'
+          }
+        },
+        resolve: {
+          stateMessage: stateMessage
+        }
+      })
+      .state('mail.account.mailbox.message.edit', {
+        url: '/edit',
+        views: {
+          'message@': {
+            templateUrl: 'UIxMailEditor', // UI/Templates/MailerUI/UIxMailEditor.wox
+            controller: 'MessageEditorController',
+            controllerAs: 'editor'
+          }
+        },
+        resolve: {
+          stateContent: stateContent
+        }
+      })
+      .state('mail.account.mailbox.message.action', {
+        url: '/{actionName:(?:reply|replyall|forward)}',
+        views: {
+          message: {
+            templateUrl: 'UIxMailEditor', // UI/Templates/MailerUI/UIxMailEditor.wox
+            controller: 'MessageEditorController',
+            controllerAs: 'editor'
+          }
+        }
+      });
+
+    // if none of the above states are matched, use this as the fallback
+    $urlRouterProvider.otherwise('/Mail/0/folderINBOX/new');
+  }
+
+  /**
+   * @ngInject
+   */
+  stateAccounts.$inject = ['$q', 'Account'];
+  function stateAccounts($q, Account) {
+    var promise = Account.$findAll();
+    // Fetch list of mailboxes for each account
+    return promise.then(function(accounts) {
+      var promises = [];
+      angular.forEach(accounts, function(account, i) {
+        var mailboxes = account.$getMailboxes();
+        promises.push(mailboxes.then(function(objects) {
+          return account;
+        }));
+      });
+      return $q.all(promises);
+    });
+  }
+
+  /**
+   * @ngInject
+   */
+  stateAccount.$inject = ['$stateParams', 'stateAccounts'];
+  function stateAccount($stateParams, stateAccounts) {
+    return _.find(stateAccounts, function(account) {
+      return account.id == $stateParams.accountId;
+    });
+  }
+
+  /**
+   * @ngInject
+   */
+  stateMailbox.$inject = ['$stateParams', 'stateAccount', 'decodeUriFilter'];
+  function stateMailbox($stateParams, stateAccount, decodeUriFilter) {
+    var mailboxId = decodeUriFilter($stateParams.mailboxId),
+        _find;
+    // Recursive find function
+    _find = function(mailboxes) {
+      var mailbox = _.find(mailboxes, function(o) {
+        return o.path == mailboxId;
+      });
+      if (!mailbox) {
+        angular.forEach(mailboxes, function(o) {
+          if (!mailbox && o.children && o.children.length > 0) {
+            mailbox = _find(o.children);
+          }
+        });
+      }
+      return mailbox;
+    };
+    return _find(stateAccount.$mailboxes);
+  }
+
+  /**
+   * @ngInject
+   */
+  stateNewMessage.$inject = ['stateAccount'];
+  function stateNewMessage(stateAccount) {
+    return stateAccount.$newMessage();
+  }
+
+  /**
+   * @ngInject
+   */
+  stateMessage.$inject = ['encodeUriFilter', '$stateParams', '$state', 'stateMailbox', 'Message'];
+  function stateMessage(encodeUriFilter, $stateParams, $state, stateMailbox, Message) {
+    var data = { uid: $stateParams.messageId.toString() },
+        message = new Message(stateMailbox.$account.id, stateMailbox, data);
+
+    return message.$reload();
+  }
+
+  /**
+   * @ngInject
+   */
+  stateContent.$inject = ['stateMessage'];
+  function stateContent(stateMessage) {
+    return stateMessage.$editableContent();
+  }
+
+  /**
+   * @ngInject
+   */
+  runBlock.$inject = ['$rootScope'];
+  function runBlock($rootScope) {
+    $rootScope.$on('$routeChangeError', function(event, current, previous, rejection) {
+      console.error(event, current, previous, rejection);
+    });
+  }
+
+  /**
+   * @ngInject
+   */
+  MessageEditorControllerPopup.$inject = ['$window', '$mdDialog', 'stateAccounts', 'stateMessage'];
+  function MessageEditorControllerPopup($window, $mdDialog, stateAccounts, stateMessage) {
+    $mdDialog
+      .show({
+        hasBackdrop: false,
+        disableParentScroll: false,
+        clickOutsideToClose: false,
+        escapeToClose: false,
+        templateUrl: 'UIxMailEditor',
+        controller: 'MessageEditorController',
+        controllerAs: 'editor',
+        locals: {
+          stateAccounts: stateAccounts,
+          stateMessage: stateMessage,
+          stateRecipients: []
+        }
+      })
+      .finally(function() {
+        if ($window.opener)
+          $window.close();
+      });
+  }
+  
+})();
@@ -6,9 +6,9 @@
  /**
   * @ngInject
   */
-  MessageController.$inject = ['$scope', '$state', '$mdDialog', 'stateAccounts', 'stateAccount', 'stateMailbox', 'stateMessage', 'encodeUriFilter', 'sgFocus', 'Dialog', 'Account', 'Mailbox', 'Message'];
-  function MessageController($scope, $state, $mdDialog, stateAccounts, stateAccount, stateMailbox, stateMessage, encodeUriFilter, focus, Dialog, Account, Mailbox, Message) {
-    var vm = this, messageDialog = null;
+  MessageController.$inject = ['$window', '$scope', '$state', '$mdDialog', 'stateAccounts', 'stateAccount', 'stateMailbox', 'stateMessage', 'encodeUriFilter', 'sgSettings', 'sgFocus', 'Dialog', 'Account', 'Mailbox', 'Message'];
+  function MessageController($window, $scope, $state, $mdDialog, stateAccounts, stateAccount, stateMailbox, stateMessage, encodeUriFilter, sgSettings, focus, Dialog, Account, Mailbox, Message) {
+    var vm = this, messageDialog = null, popupWindow = null;

    vm.accounts = stateAccounts;
    vm.account = stateAccount;
@@ -22,6 +22,8 @@
    vm.replyAll = replyAll;
    vm.forward = forward;
    vm.edit = edit;
+    vm.openPopup = openPopup;
+    vm.closePopup = closePopup;
    vm.newMessage = newMessage;
    vm.saveMessage = saveMessage;
    vm.viewRawSource = viewRawSource;
@@ -103,6 +105,33 @@
      });
    }

+    function openPopup() {
+      var url = [sgSettings.baseURL(),
+                 'UIxMailPopupView#/Mail',
+                 vm.message.accountId,
+                 // The double-encoding is necessary
+                 encodeUriFilter(encodeUriFilter(vm.message.$mailbox.path)),
+                 vm.message.uid]
+          .join('/'),
+          wId = vm.message.$absolutePath();
+      popupWindow = $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(','));
+    }
+
+    function closePopup() {
+      $window.close();
+    }
+
    function newMessage($event, recipient) {
      var message = vm.account.$newMessage();
      showMailEditor($event, message, [recipient]);