CRM-15578 - crmMailing2 - Add dependency, dialogService

diff --git a/CRM/Core/Page/Angular.php b/CRM/Core/Page/Angular.php
index 35141c151741f570feed5dcde9859a602064c267..cca6024ba3c1d2d189ec0a019081e604bdbe9819 100644 (file)
--- a/CRM/Core/Page/Angular.php
+++ b/CRM/Core/Page/Angular.php
@@ -67,6 +67,8 @@ class CRM_Core_Page_Angular extends CRM_Core_Page {
     $angularModules['ui.utils'] = array('ext' => 'civicrm', 'js' => array('packages/bower_components/angular-ui-utils/ui-utils.min.js'));
     $angularModules['ui.sortable'] = array('ext' => 'civicrm', 'js' => array('packages/bower_components/angular-ui-sortable/sortable.min.js'));
     $angularModules['unsavedChanges'] = array('ext' => 'civicrm', 'js' => array('packages/bower_components/angular-unsavedChanges/dist/unsavedChanges.min.js'));
+    // https://github.com/jwstadler/angular-jquery-dialog-service
+    $angularModules['dialogService'] = array('ext' => 'civicrm' , 'js' => array('packages/bower_components/angular-jquery-dialog-service/dialog-service.js'));
     $angularModules['crmUi'] = array('ext' => 'civicrm', 'js' => array('js/angular-crm-ui.js'));
 
     foreach (CRM_Core_Component::getEnabledComponents() as $component) {

diff --git a/js/angular-crmMailing2.js b/js/angular-crmMailing2.js
index 11ad303615f747b941491b10aff35e78e7c7b08a..40ef88a269410f598e3d8a246b04dc27bc5046ea 100644 (file)
--- a/js/angular-crmMailing2.js
+++ b/js/angular-crmMailing2.js
@@ -3,7 +3,7 @@
     return CRM.resourceUrls['civicrm'] + '/partials/crmMailing2/' + relPath;
   };
 
-  var crmMailing2 = angular.module('crmMailing2', ['ngRoute', 'ui.utils', 'crmUi']); // TODO ngSanitize, unsavedChanges
+  var crmMailing2 = angular.module('crmMailing2', ['ngRoute', 'ui.utils', 'crmUi', 'dialogService']); // TODO ngSanitize, unsavedChanges
 
   /**
    * Initialize a new mailing