Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master

Conflicts:
	app/models/SuperModel.coffee
This commit is contained in:
Scott Erickson 2014-03-26 14:39:01 -07:00
parent fae9034dfc
commit 8001e58848

View file

@ -40,7 +40,7 @@ class SuperModel
continue if @models[refURL]
@models[refURL] = ref
ref.fetch()
ref.once 'sync', @modelLoaded, @
@listenToOnce(ref, 'sync', @modelLoaded)
@trigger 'loaded-one', model: model
@trigger 'loaded-all' if @finished()