CRM-15832 - getAngularModules - Cleanup

diff --git a/CRM/Core/Page/Angular.php b/CRM/Core/Page/Angular.php
index f2d8e3839b5f0a665aab9066f10d4d1fba2d8d8f..3bdac40234e47e133ffaf4fd727af37be98284b3 100644 (file)
--- a/CRM/Core/Page/Angular.php
+++ b/CRM/Core/Page/Angular.php
@@ -91,7 +91,10 @@ class CRM_Core_Page_Angular extends CRM_Core_Page {
       'ext' => 'civicrm',
       'js' => array('bower_components/angular-file-upload/angular-file-upload.min.js'),
     );
-    $angularModules['crmApp'] = array('ext' => 'civicrm', 'js' => array('js/angular-crmApp.js'));
+    $angularModules['crmApp'] = array(
+      'ext' => 'civicrm',
+      'js' => array('js/angular-crmApp.js'),
+    );
     $angularModules['crmAttachment'] = array(
       'ext' => 'civicrm',
       'js' => array('js/angular-crmAttachment.js'),
@@ -103,13 +106,19 @@ class CRM_Core_Page_Angular extends CRM_Core_Page {
       'js' => array('js/angular-crm-ui.js', 'packages/ckeditor/ckeditor.js'),
       'partials' => array('partials/crmUi/*.html'),
     );
-    $angularModules['crmUtil'] = array('ext' => 'civicrm', 'js' => array('js/angular-crm-util.js'));
+    $angularModules['crmUtil'] = array(
+      'ext' => 'civicrm',
+      'js' => array('js/angular-crm-util.js'),
+    );
     // https://github.com/jwstadler/angular-jquery-dialog-service
     $angularModules['dialogService'] = array(
       'ext' => 'civicrm',
       'js' => array('bower_components/angular-jquery-dialog-service/dialog-service.js'),
     );
-    $angularModules['ngSanitize'] = array('ext' => 'civicrm', 'js' => array('js/angular-sanitize.js'));
+    $angularModules['ngSanitize'] = array(
+      'ext' => 'civicrm',
+      'js' => array('js/angular-sanitize.js'),
+    );
     $angularModules['ui.utils'] = array(
       'ext' => 'civicrm',
       'js' => array('bower_components/angular-ui-utils/ui-utils.min.js'),

diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
index d2d0cf68bedb70574cd00a81fba16cab0eafbeaf..d9be4a2975e633095ca9cf2ed7320a5c09aeb239 100644 (file)
--- a/CRM/Mailing/Info.php
+++ b/CRM/Mailing/Info.php
@@ -63,8 +63,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
       'ext' => 'civicrm',
       'js' => array(
         'js/angular-crmMailing.js',
-        'js/angular-crmMailing/services.js',
-        'js/angular-crmMailing/directives.js',
+        'js/angular-crmMailing/*.js',
       ),
       'css' => array('css/angular-crmMailing.css'),
       'partials' => array(
@@ -78,8 +77,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
       'ext' => 'civicrm',
       'js' => array(
         'js/angular-crmMailingAB.js',
-        'js/angular-crmMailingAB/services.js',
-        'js/angular-crmMailingAB/directives.js',
+        'js/angular-crmMailingAB/*.js',
       ),
       'css' => array('css/angular-crmMailingAB.css'),
       'partials' => array(
@@ -88,7 +86,10 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     );
     $result['crmD3'] = array(
       'ext' => 'civicrm',
-      'js' => array('js/angular-crmD3.js', 'bower_components/d3/d3.min.js'),
+      'js' => array(
+        'js/angular-crmD3.js',
+        'bower_components/d3/d3.min.js',
+      ),
     );
 
     $config = CRM_Core_Config::singleton();