From 6c12384fe96d7173660c2bab1056c09ccdd5bfed Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Mon, 8 Sep 2014 14:13:19 -0700 Subject: [PATCH 1/3] Reenabling on surface mouse moved. --- app/views/editor/level/thangs/ThangsTabView.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/editor/level/thangs/ThangsTabView.coffee b/app/views/editor/level/thangs/ThangsTabView.coffee index 9fb81044f..fd5201ed2 100644 --- a/app/views/editor/level/thangs/ThangsTabView.coffee +++ b/app/views/editor/level/thangs/ThangsTabView.coffee @@ -384,7 +384,7 @@ module.exports = class ThangsTabView extends CocoView return unless @addThangSprite wop = @surface.camera.screenToWorld x: e.x, y: e.y wop.z = 0.5 - #@adjustThangPos @addThangSprite, @addThangSprite.thang, wop # TODO: this and onSpriteDragged both conflictin' + @adjustThangPos @addThangSprite, @addThangSprite.thang, wop # TODO: this and onSpriteDragged both conflictin' null onSurfaceMouseOver: (e) -> From 8dad2bf12df5e661bfc8ac4b633343db1042e9c0 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Mon, 8 Sep 2014 14:26:17 -0700 Subject: [PATCH 2/3] Fixed some typo. --- app/views/play/level/tome/SpellListEntryView.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/play/level/tome/SpellListEntryView.coffee b/app/views/play/level/tome/SpellListEntryView.coffee index 0a9fa82bb..d2d39edb1 100644 --- a/app/views/play/level/tome/SpellListEntryView.coffee +++ b/app/views/play/level/tome/SpellListEntryView.coffee @@ -103,7 +103,7 @@ module.exports = class SpellListEntryView extends CocoView return if @thangsView spellThang = @getPrimarySpellThang() 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() @$el.append @thangsView.el @thangsView.$el.mouseenter (e) => @onMouseEnterAvatar() From c64c391d7470f9e2f103a763afae23d572d065c5 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Mon, 8 Sep 2014 14:31:52 -0700 Subject: [PATCH 3/3] Workaround for missing document.location inside child window in Windows Chrome. --- app/models/CocoModel.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/CocoModel.coffee b/app/models/CocoModel.coffee index ff601bcb5..2418ae9c4 100644 --- a/app/models/CocoModel.coffee +++ b/app/models/CocoModel.coffee @@ -110,7 +110,7 @@ class CocoModel extends Backbone.Model save: (attrs, options) -> options ?= {} options.headers ?= {} - options.headers['X-Current-Path'] = document.location.pathname + options.headers['X-Current-Path'] = document.location?.pathname ? 'unknown' success = options.success error = options.error options.success = (model, res) =>