codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-26 00:58:00 -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-09-08 14:32:27 -07:00
commit 638d509672
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/CocoModel.coffee
View file

@ -110,7 +110,7 @@ class CocoModel extends Backbone.Model
save: (attrs, options) -> save: (attrs, options) ->
options ?= {} options ?= {}
options.headers ?= {} options.headers ?= {}
options.headers['X-Current-Path'] = document.location.pathname options.headers['X-Current-Path'] = document.location?.pathname ? 'unknown'
success = options.success success = options.success
error = options.error error = options.error
options.success = (model, res) => options.success = (model, res) =>

2
app/views/play/level/tome/SpellListEntryView.coffee
View file

@ -103,7 +103,7 @@ module.exports = class SpellListEntryView extends CocoView
return if @thangsView return if @thangsView
spellThang = @getPrimarySpellThang() spellThang = @getPrimarySpellThang()
return unless spellThang return unless spellThang
@thangsView = new SpellListEntryThangsView thangs: (spellThang.thang for thangID, spellThang of @spell.thangs), thang: spellTHang.thang, spell: @spell, supermodel: @supermodel @thangsView = new SpellListEntryThangsView thangs: (spellThang.thang for thangID, spellThang of @spell.thangs), thang: spellThang.thang, spell: @spell, supermodel: @supermodel
@thangsView.render() @thangsView.render()
@$el.append @thangsView.el @$el.append @thangsView.el
@thangsView.$el.mouseenter (e) => @onMouseEnterAvatar() @thangsView.$el.mouseenter (e) => @onMouseEnterAvatar()