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

fix #714

stable
Juanfran 2014-08-19 12:58:13 +02:00
parent 1b56d15a1b
commit 268d2e06c5
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/coffee/modules/common/loader.coffee
View File

@ -72,10 +72,6 @@ Loader = () ->
log = _.merge({}, defaultLog) log = _.merge({}, defaultLog)
config = _.merge({}, defaultConfig) config = _.merge({}, defaultConfig)
reset = () ->
log = _.merge({}, defaultLog)
config = _.merge({}, defaultConfig)
@.add = (auto = false) -> @.add = (auto = false) ->
return () -> return () ->
if !forceDisabled if !forceDisabled
@ -86,25 +82,32 @@ Loader = () ->
interval = null interval = null
startLoadTime = 0 startLoadTime = 0
return { reset = () ->
reset: () -> log = _.merge({}, defaultLog)
reset() config = _.merge({}, defaultConfig)
pageLoaded: () -> pageLoaded = (force = false) ->
reset() if startLoadTime
timeout = 0
if !force
endTime = new Date().getTime() endTime = new Date().getTime()
diff = endTime - startLoadTime diff = endTime - startLoadTime
if diff < config.minTime if diff < config.minTime
timeout = config.minTime - diff timeout = config.minTime - diff
else
timeout = 0
setTimeout ( -> setTimeout ( ->
$rootscope.$broadcast("loader:end") $rootscope.$broadcast("loader:end")
), timeout ), timeout
return {
reset: () ->
reset()
pageLoaded: () ->
pageLoaded()
start: () -> start: () ->
if config.enabled if config.enabled
if config.auto if config.auto
@ -119,6 +122,8 @@ Loader = () ->
startLoadTime = new Date().getTime() startLoadTime = new Date().getTime()
$rootscope.$broadcast("loader:start") $rootscope.$broadcast("loader:start")
else
pageLoaded(true)
onStart: (fn) -> onStart: (fn) ->
$rootscope.$on("loader:start", fn) $rootscope.$on("loader:start", fn)