From 729802222f673a319e5613701b17576539b8af28 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 18 Nov 2019 11:57:53 -0500
Subject: [PATCH] fix(mail(js)): add missing library to save msg from popup
 window

Fixes #4879
---
 UI/Templates/MailerUI/UIxMailPopupView.wox          |  2 +-
 UI/WebServerResources/js/Common/Resource.service.js | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/UI/Templates/MailerUI/UIxMailPopupView.wox b/UI/Templates/MailerUI/UIxMailPopupView.wox
index b01147520b..abcd3df678 100644
--- a/UI/Templates/MailerUI/UIxMailPopupView.wox
+++ b/UI/Templates/MailerUI/UIxMailPopupView.wox
@@ -9,7 +9,7 @@
     className="UIxPageFrame"
     title="title"
     const:popup="YES"
-    const:jsFiles="Common.js, Preferences.services.js, Contacts.services.js, Scheduler.services.js, Mailer.app.popup.js, Mailer.services.js, vendor/ckeditor/ckeditor.js, vendor/ckeditor/ck.js, vendor/angular-file-upload.min.js">
+    const:jsFiles="Common.js, Preferences.services.js, Contacts.services.js, Scheduler.services.js, Mailer.app.popup.js, Mailer.services.js, vendor/ckeditor/ckeditor.js, vendor/ckeditor/ck.js, vendor/angular-file-upload.min.js, vendor/FileSaver.min.js">
 
   <main class="layout-fill" ng-controller="navController">
     <div id="detailView" class="view-detail md-default-theme md-background md-bg md-hue-2"
diff --git a/UI/WebServerResources/js/Common/Resource.service.js b/UI/WebServerResources/js/Common/Resource.service.js
index db43749e12..d4deacd8de 100644
--- a/UI/WebServerResources/js/Common/Resource.service.js
+++ b/UI/WebServerResources/js/Common/Resource.service.js
@@ -191,6 +191,10 @@
     if (action) path.push(action);
     path = _.compact(_.flatten(path)).join('/');
 
+    if (typeof saveAs == 'undefined') {
+      throw new Error('To use Resource.download, FileSaver.js must be loaded.');
+    }
+
     function getFileNameFromHeader(header) {
       var result;
 
@@ -224,12 +228,7 @@
         else {
           getFileNameFromHeader(headers('content-disposition'));
         }
-        if (!saveAs) {
-          throw new Error('To use Resource.download, FileSaver.js must be loaded.');
-        }
-        else {
-          saveAs(blob, fileName);
-        }
+        saveAs(blob, fileName);
       }
     });
   };