From e81cf29e4cfab9f2f70289c147f1c042e1f9fd2b Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 21 Aug 2018 10:43:01 -0400
Subject: [PATCH] (js) Restore caret position in message editor

Cont'd.

Fixes #4517
---
 .../js/Mailer/MailboxController.js                  |  1 -
 UI/WebServerResources/js/Mailer/Mailer.popup.js     | 13 ++++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/UI/WebServerResources/js/Mailer/MailboxController.js b/UI/WebServerResources/js/Mailer/MailboxController.js
index ca310e239..b9942fdb4 100644
--- a/UI/WebServerResources/js/Mailer/MailboxController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxController.js
@@ -215,7 +215,6 @@
                  'new']
           .join('/'),
           wId = vm.selectedFolder.$id() + '/' + Math.random(0, 1000);
-      console.debug(url);
       $window.open(url, wId,
                    ["width=680",
                     "height=520",
diff --git a/UI/WebServerResources/js/Mailer/Mailer.popup.js b/UI/WebServerResources/js/Mailer/Mailer.popup.js
index 401725ef8..7c2641c88 100644
--- a/UI/WebServerResources/js/Mailer/Mailer.popup.js
+++ b/UI/WebServerResources/js/Mailer/Mailer.popup.js
@@ -237,8 +237,9 @@
   /**
    * @ngInject
    */
-  MessageEditorControllerPopup.$inject = ['$window', '$mdDialog', 'stateAccount', 'stateMessage'];
-  function MessageEditorControllerPopup($window, $mdDialog, stateAccount, stateMessage) {
+  MessageEditorControllerPopup.$inject = ['$window', '$q', '$mdDialog', 'stateAccount', 'stateMessage'];
+  function MessageEditorControllerPopup($window, $q, $mdDialog, stateAccount, stateMessage) {
+    var onCompleteDeferred = $q.defer();
     $mdDialog
       .show({
         hasBackdrop: false,
@@ -248,9 +249,15 @@
         templateUrl: 'UIxMailEditor',
         controller: 'MessageEditorController',
         controllerAs: 'editor',
+        onComplete: function (scope, element) {
+          return onCompleteDeferred.resolve(element);
+        },
         locals: {
           stateAccount: stateAccount,
-          stateMessage: stateMessage
+          stateMessage: stateMessage,
+          onCompletePromise: function () {
+            return onCompleteDeferred.promise;
+          }
         }
       })
       .finally(function() {