codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 18:15:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2014-10-21 20:30:01 -07:00
commit d9f3bc7cc9
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/CocoModel.coffee
View file

@ -65,8 +65,7 @@ class CocoModel extends Backbone.Model
set: (attributes, options) ->
delete @attributesWithDefaults unless attributes is 'thangs' # unless attributes is 'thangs': performance optimization for Levels keeping their cache.
inFlux = @loading or not @loaded
console.log @type(), @get('name'), 'setting', attributes, options
console.trace
console.error @type(), @get('name'), 'setting', attributes, options
@markToRevert() unless inFlux or @_revertAttributes or @project or options?.fromMerge
res = super attributes, options
@saveBackup() if @saveBackups and (not inFlux)
@ -81,8 +80,7 @@ class CocoModel extends Backbone.Model
TreemaNode.utils.populateDefaults(clone, @schema(), thisTV4)
@attributesWithDefaults = clone
duration = new Date() - t0
console.debug "Populated defaults for #{@type()}#{if @attributes.name then ' ' + @attributes.name else ''} in #{duration}ms"# if duration > 10
console.trace?()
console.debug "Populated defaults for #{@type()}#{if @attributes.name then ' ' + @attributes.name else ''} in #{duration}ms" if duration > 10
loadFromBackup: ->
return unless @saveBackups