codeninjasllc/codecombat
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Missed committing part of previous fix.

Browse source
This commit is contained in:
Nick Winter 2014-09-03 10:58:43 -07:00
parent 975c6ad2a6
commit c1a7b70849
1 changed files with 1 additions and 1 deletions

2
app/models/CocoModel.coffee
View file

@ -64,7 +64,7 @@ class CocoModel extends Backbone.Model
set: (attributes, options) -> set: (attributes, options) ->
delete @attributesWithDefaults delete @attributesWithDefaults
inFlux = @loading or not @loaded inFlux = @loading or not @loaded
@markToRevert() unless inFlux or @_revertAttributes or @project or options?.silent @markToRevert() unless inFlux or @_revertAttributes or @project or options?.fromMerge
res = super attributes, options res = super attributes, options
@saveBackup() if @saveBackups and (not inFlux) and @hasLocalChanges() @saveBackup() if @saveBackups and (not inFlux) and @hasLocalChanges()
res res