diff --git a/app/coffee/modules/base/conf.coffee b/app/coffee/modules/base/conf.coffee index 2caaeee4..68518935 100644 --- a/app/coffee/modules/base/conf.coffee +++ b/app/coffee/modules/base/conf.coffee @@ -29,6 +29,7 @@ class ConfigurationService @.$inject = ["localconf"] constructor: (localconf) -> + console.log localconf @.config = _.merge(_.clone(defaults, true), localconf) get: (key, defaultValue=null) -> @@ -40,4 +41,3 @@ class ConfigurationService module = angular.module("taigaBase") module.service("$tgConfig", ConfigurationService) module.value("localconf", null) - diff --git a/gulpfile.coffee b/gulpfile.coffee index 7c37013b..617951e3 100644 --- a/gulpfile.coffee +++ b/gulpfile.coffee @@ -239,7 +239,6 @@ gulp.task "jslibs-deploy", -> gulp.task "app-watch", ["coffee", "conf", "locales"], -> _paths = [ paths.tmp + "app.js", - paths.tmp + "conf.js", paths.tmp + "locales.en.js" ] @@ -250,7 +249,6 @@ gulp.task "app-watch", ["coffee", "conf", "locales"], -> gulp.task "app-deploy", ["coffee", "conf", "locales"], -> _paths = [ paths.tmp + "app.js", - paths.tmp + "conf.js", paths.tmp + "locales.en.js" ]