Improved initFetch behaviour.

2014-09-22 19:36:18 +02:00 · 2014-09-22 19:36:18 +02:00 · 24d9c523c4
commit 24d9c523c4
parent 12fc2adc3e
1 changed files with 5 additions and 4 deletions
--- a/app/assets/javascripts/app/models/_application_model.js.coffee
+++ b/app/assets/javascripts/app/models/_application_model.js.coffee
@ -327,12 +327,13 @@ class App.Model extends Spine.Model

    # fetch init collection
    if param.initFetch is true
-      @one 'refresh', (collection) =>
-        @initFetchActive = false
-        callback(collection)
      if !@initFetchActive
-        @initFetchActive = true
+        @one 'refresh', (collection) =>
+          @initFetchActive = true
+          callback(collection)
        @fetch( {}, { clear: true } )
+      else
+        callback( @all() )

    # return key
    key