taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove conf from app.js

stable
Juanfran 2015-01-15 11:46:21 +01:00
parent d3823bfabb
commit 2e498b2b90
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffee/modules/base/conf.coffee
View File

@ -29,6 +29,7 @@ class ConfigurationService
@.$inject = ["localconf"] @.$inject = ["localconf"]
constructor: (localconf) -> constructor: (localconf) ->
console.log localconf
@.config = _.merge(_.clone(defaults, true), localconf) @.config = _.merge(_.clone(defaults, true), localconf)
get: (key, defaultValue=null) -> get: (key, defaultValue=null) ->
@ -40,4 +41,3 @@ class ConfigurationService
module = angular.module("taigaBase") module = angular.module("taigaBase")
module.service("$tgConfig", ConfigurationService) module.service("$tgConfig", ConfigurationService)
module.value("localconf", null) module.value("localconf", null)

2
gulpfile.coffee
View File

@ -239,7 +239,6 @@ gulp.task "jslibs-deploy", ->
gulp.task "app-watch", ["coffee", "conf", "locales"], -> gulp.task "app-watch", ["coffee", "conf", "locales"], ->
_paths = [ _paths = [
paths.tmp + "app.js", paths.tmp + "app.js",
paths.tmp + "conf.js",
paths.tmp + "locales.en.js" paths.tmp + "locales.en.js"
] ]
@ -250,7 +249,6 @@ gulp.task "app-watch", ["coffee", "conf", "locales"], ->
gulp.task "app-deploy", ["coffee", "conf", "locales"], -> gulp.task "app-deploy", ["coffee", "conf", "locales"], ->
_paths = [ _paths = [
paths.tmp + "app.js", paths.tmp + "app.js",
paths.tmp + "conf.js",
paths.tmp + "locales.en.js" paths.tmp + "locales.en.js"
] ]