codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-02-16 08:29:56 -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:12:26 -07:00
commit a14477023f
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/CocoModel.coffee
View file

@ -65,6 +65,8 @@ 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
@markToRevert() unless inFlux or @_revertAttributes or @project or options?.fromMerge
res = super attributes, options
@saveBackup() if @saveBackups and (not inFlux)

1
app/views/play/WorldMapView.coffee
View file

@ -221,7 +221,6 @@ module.exports = class WorldMapView extends RootView
storage.save("loaded-menu-music-#{@terrain}", true) unless @probablyCachedMusic
preloadTopHeroes: ->
return # Testing to see if this is causing the weird problem with ThangTypes overwriting me
for heroID in ['captain', 'knight']
url = "/db/thang.type/#{ThangType.heroes[heroID]}/version"
continue if @supermodel.getModel url