CRM-16246 - Load ngRoute through Civi\Angular\Manager

This should resolve one of Chrome's warnings about min.map.

diff --git a/Civi/Angular/Manager.php b/Civi/Angular/Manager.php
index a9036908ad22a115c61666b230db257af1ba37ca..6effe4ce1cc86581721a3368d3ede8147ae692b2 100644 (file)
--- a/Civi/Angular/Manager.php
+++ b/Civi/Angular/Manager.php
@@ -97,6 +97,10 @@ class Manager {
         'ext' => 'civicrm',
         'js' => array('bower_components/angular-jquery-dialog-service/dialog-service.js'),
       );
+      $angularModules['ngRoute'] = array(
+        'ext' => 'civicrm',
+        'js' => array('bower_components/angular-route/angular-route.min.js'),
+      );
       $angularModules['ui.utils'] = array(
         'ext' => 'civicrm',
         'js' => array('bower_components/angular-ui-utils/ui-utils.min.js'),

diff --git a/Civi/Angular/Page/Main.php b/Civi/Angular/Page/Main.php
index c8f7a258c86e10a92d4fe95274f37fb7942da744..e52f0a1dd399613cd73d153e488cfa7680ddfff4 100644 (file)
--- a/Civi/Angular/Page/Main.php
+++ b/Civi/Angular/Page/Main.php
@@ -81,7 +81,6 @@ class Main extends \CRM_Core_Page {
     });
 
     $this->res->addScriptFile('civicrm', 'bower_components/angular/angular.min.js', 100, 'html-header', FALSE);
-    $this->res->addScriptFile('civicrm', 'bower_components/angular-route/angular-route.min.js', 110, 'html-header', FALSE);
 
     // FIXME: crmUi depends on loading ckeditor, but ckeditor doesn't work with this aggregation.
     $this->res->addScriptFile('civicrm', 'packages/ckeditor/ckeditor.js', 100, 'page-header', FALSE);