From c97bfffd728b0c2e75e39e3a21eda252324fe1e5 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Fri, 5 Sep 2014 15:03:45 +0200 Subject: update some stuff --- js/karma.conf.js | 6 +----- 1 file changed, 1 insertion(+), 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', -- cgit v1.2.3