projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-17417 and CRM-17418 fixes
[civicrm-core.git]
/
karma.conf.js
diff --git
a/karma.conf.js
b/karma.conf.js
index 50c56bf3e94e34127f49510239d03972f15ebed3..eada18ded519964e83d60c5e5d179d07534fd613 100644
(file)
--- a/
karma.conf.js
+++ b/
karma.conf.js
@@
-23,18
+23,18
@@
module.exports = function(config) {
'bower_components/angular-unsavedChanges/dist/unsavedChanges.js',
'tests/karma/modules.js',
'js/crm.ajax.js',
'bower_components/angular-unsavedChanges/dist/unsavedChanges.js',
'tests/karma/modules.js',
'js/crm.ajax.js',
- '
js/angular-
*.js',
- '
js/angular-crmMailing
/*.js',
+ '
ang/
*.js',
+ '
ang/**
/*.js',
'tests/karma/lib/*.js',
'tests/karma/**/*.js',
'tests/karma/lib/*.js',
'tests/karma/**/*.js',
- '
partials
/**/*.html'
+ '
ang
/**/*.html'
],
preprocessors : {
],
preprocessors : {
- '
partials
/**/*.html' : ['ng-html2js']
+ '
ang
/**/*.html' : ['ng-html2js']
},
ngHtml2JsPreprocessor: {
},
ngHtml2JsPreprocessor: {
- stripPrefix: '
partials
/',
+ stripPrefix: '
ang
/',
prependPrefix: '~/',
moduleName: 'crmResource'
},
prependPrefix: '~/',
moduleName: 'crmResource'
},