summaryrefslogtreecommitdiffstats
path: root/js/karma.conf.js
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-09-05 15:03:45 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-09-05 15:03:45 +0200
commitc97bfffd728b0c2e75e39e3a21eda252324fe1e5 (patch)
treedeac62e43ac81eaef54254c1aafc7fb70b3ed313 /js/karma.conf.js
parent59db6aebdee6c7c05e5bc741ffe2b85cbdce51d7 (diff)
update some stuff
Diffstat (limited to 'js/karma.conf.js')
-rw-r--r--js/karma.conf.js6
1 files changed, 1 insertions, 5 deletions
diff --git a/js/karma.conf.js b/js/karma.conf.js
index daa7beca6..a0bfe5e26 100644
--- a/js/karma.conf.js
+++ b/js/karma.conf.js
@@ -27,9 +27,7 @@ module.exports = function (config) {
traceurPreprocessor: {
options: {
- blockBinding: true,
experimental: true,
- sourceMap: true,
modules: 'inline'
}
},
@@ -37,9 +35,7 @@ module.exports = function (config) {
// list of files / patterns to load in the browser
files: [
'vendor/jquery/dist/jquery.js',
- 'vendor/momentjs/moment.js',
- 'vendor/momentjs/min/langs.js',
- 'vendor/bootstrap/tooltip.js',
+ 'vendor/momentjs/min/moment-with-locales.js',
'vendor/angular/angular.js',
'vendor/angular-mocks/angular-mocks.js',
'vendor/angular-route/angular-route.js',