codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-05-02 00:43:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed another bug related to the race condition fix.

Browse source
This commit is contained in:
Scott Erickson 2014-03-08 14:34:25 -08:00
parent afbe2200a6
commit 57f1588dea
1 changed files with 9 additions and 2 deletions

11
app/models/SuperModel.coffee
View file

@ -2,6 +2,7 @@ class SuperModel
constructor: -> constructor: ->
@models = {} @models = {}
@collections = {} @collections = {}
@schemas = {}
_.extend(@, Backbone.Events) _.extend(@, Backbone.Events)
populateModel: (model) -> populateModel: (model) ->
@ -25,8 +26,11 @@ class SuperModel
@removeEventsFromModel(model) @removeEventsFromModel(model)
modelLoaded: (model) -> modelLoaded: (model) ->
model.loadSchema()
schema = model.schema() schema = model.schema()
return schema.once('sync', => @modelLoaded(model)) unless schema.loaded unless schema.loaded
@schemas[schema.urlRoot] = schema
return schema.once('sync', => @modelLoaded(model))
refs = model.getReferencedModels(model.attributes, schema.attributes, '/', @shouldLoadProjection) refs = model.getReferencedModels(model.attributes, schema.attributes, '/', @shouldLoadProjection)
refs = [] unless @mustPopulate is model or @shouldPopulate(model) refs = [] unless @mustPopulate is model or @shouldPopulate(model)
# console.log 'Loaded', model.get('name') # console.log 'Loaded', model.get('name')
@ -96,9 +100,12 @@ class SuperModel
total = 0 total = 0
loaded = 0 loaded = 0
for key, model of @models for model in _.values @models
total += 1 total += 1
loaded += 1 if model.loaded loaded += 1 if model.loaded
for schema in _.values @schemas
total += 1
loaded += 1 if schema.loaded
return 1.0 unless total return 1.0 unless total
return loaded / total return loaded / total