From 1c03fdf8ddede83fccb1660c10d9b4676def0c29 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 9 Apr 2015 16:31:00 -0700 Subject: [PATCH] CRM-16246 - Load ngRoute through Civi\Angular\Manager This should resolve one of Chrome's warnings about min.map. --- Civi/Angular/Manager.php | 4 ++++ Civi/Angular/Page/Main.php | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Civi/Angular/Manager.php b/Civi/Angular/Manager.php index a9036908ad..6effe4ce1c 100644 --- 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 c8f7a258c8..e52f0a1dd3 100644 --- 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); -- 2.25.1