Merge branch 'master' into production

This commit is contained in:
Nick Winter 2014-10-21 21:38:00 -07:00
commit bbca17404f

View file

@ -65,7 +65,6 @@ 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.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)