projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '4.6' into master
[civicrm-core.git]
/
Civi
/
Angular
/
Manager.php
diff --git
a/Civi/Angular/Manager.php
b/Civi/Angular/Manager.php
index b3ac3d60c49e1bd2f759dc1b900ed8c91cc88673..8977e1c14f5eb6451a7ba92e2b9155c8bbc60bfe 100644
(file)
--- a/
Civi/Angular/Manager.php
+++ b/
Civi/Angular/Manager.php
@@
-81,6
+81,12
@@
class Manager {
'ext' => 'civicrm',
'js' => array('ang/crmAutosave.js'),
);
'ext' => 'civicrm',
'js' => array('ang/crmAutosave.js'),
);
+ $angularModules['crmCxn'] = array(
+ 'ext' => 'civicrm',
+ 'js' => array('ang/crmCxn.js', 'ang/crmCxn/*.js'),
+ 'css' => array('ang/crmCxn.css'),
+ 'partials' => array('ang/crmCxn'),
+ );
//$angularModules['crmExample'] = array(
// 'ext' => 'civicrm',
// 'js' => array('ang/crmExample.js'),
//$angularModules['crmExample'] = array(
// 'ext' => 'civicrm',
// 'js' => array('ang/crmExample.js'),
@@
-113,6
+119,10
@@
class Manager {
'ext' => 'civicrm',
'js' => array('bower_components/angular-route/angular-route.min.js'),
);
'ext' => 'civicrm',
'js' => array('bower_components/angular-route/angular-route.min.js'),
);
+ $angularModules['ngSanitize'] = array(
+ 'ext' => 'civicrm',
+ 'js' => array('bower_components/angular-sanitize/angular-sanitize.min.js'),
+ );
$angularModules['ui.utils'] = array(
'ext' => 'civicrm',
'js' => array('bower_components/angular-ui-utils/ui-utils.min.js'),
$angularModules['ui.utils'] = array(
'ext' => 'civicrm',
'js' => array('bower_components/angular-ui-utils/ui-utils.min.js'),