From 26b69d25ee6249410b6ea725c01782b35ac54158 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 17 Jan 2017 16:19:07 -0500 Subject: [PATCH] (js) Fix opening message in popup window --- UI/WebServerResources/js/Mailer/MessageController.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/UI/WebServerResources/js/Mailer/MessageController.js b/UI/WebServerResources/js/Mailer/MessageController.js index e8579e44f..3c3f5c334 100644 --- a/UI/WebServerResources/js/Mailer/MessageController.js +++ b/UI/WebServerResources/js/Mailer/MessageController.js @@ -107,9 +107,12 @@ * To keep track of the currently active dialog, we share a common variable with the parent controller. */ function _messageDialog() { - if (arguments.length > 0) - $scope.mailbox.messageDialog = arguments[0]; - return $scope.mailbox.messageDialog; + if ($scope.mailbox) { + if (arguments.length > 0) + $scope.mailbox.messageDialog = arguments[0]; + return $scope.mailbox.messageDialog; + } + return null; } function _unlessInDialog(callback) { @@ -331,7 +334,7 @@ function openPopup() { var url = [sgSettings.baseURL(), - 'UIxMailPopupView#/Mail', + 'UIxMailPopupView#!/Mail', vm.message.accountId, // The double-encoding is necessary encodeUriFilter(encodeUriFilter(vm.message.$mailbox.path)),