From: Tim Otten Date: Wed, 5 Nov 2014 05:08:18 +0000 (-0800) Subject: CRM-15578 - crmMailing2 - Add dependency, dialogService X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=952485ea693acb044a77da3d2e7a2ed3997fb5c9;p=civicrm-core.git CRM-15578 - crmMailing2 - Add dependency, dialogService --- diff --git a/CRM/Core/Page/Angular.php b/CRM/Core/Page/Angular.php index 35141c1517..cca6024ba3 100644 --- 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 11ad303615..40ef88a269 100644 --- 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