From 31c5890288a68333f3ccbaa61037b0708a6c87a6 Mon Sep 17 00:00:00 2001
From: Scott Erickson <sderickson@gmail.com>
Date: Thu, 1 May 2014 15:44:50 -0700
Subject: [PATCH] Fixed #934

---
 app/lib/LevelLoader.coffee                    | 2 +-
 app/views/editor/level/edit.coffee            | 2 +-
 app/views/editor/level/thangs_tab_view.coffee | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/lib/LevelLoader.coffee b/app/lib/LevelLoader.coffee
index b4c92f55a..a276d0364 100644
--- a/app/lib/LevelLoader.coffee
+++ b/app/lib/LevelLoader.coffee
@@ -121,7 +121,7 @@ module.exports = class LevelLoader extends CocoClass
       url = "/db/level/#{obj.original}/version/#{obj.majorVersion}"
       @maybeLoadURL url, Level, 'level'
 
-    unless @headless
+    unless @headless and not @editorMode
       wizard = ThangType.loadUniversalWizard()
       @supermodel.loadModel wizard, 'thang'
 
diff --git a/app/views/editor/level/edit.coffee b/app/views/editor/level/edit.coffee
index ed48d7d5e..24dd13b10 100644
--- a/app/views/editor/level/edit.coffee
+++ b/app/views/editor/level/edit.coffee
@@ -64,7 +64,7 @@ module.exports = class EditorLevelView extends View
     return unless @supermodel.finished()
     @$el.find('a[data-toggle="tab"]').on 'shown.bs.tab', (e) =>
       Backbone.Mediator.publish 'level:view-switched', e
-    @thangsTab = @insertSubView new ThangsTabView world: @world, supermodel: @supermodel
+    @thangsTab = @insertSubView new ThangsTabView world: @world, supermodel: @supermodel, level: @level
     @settingsTab = @insertSubView new SettingsTabView supermodel: @supermodel
     @scriptsTab = @insertSubView new ScriptsTabView world: @world, supermodel: @supermodel, files: @files
     @componentsTab = @insertSubView new ComponentsTabView supermodel: @supermodel
diff --git a/app/views/editor/level/thangs_tab_view.coffee b/app/views/editor/level/thangs_tab_view.coffee
index 85d0370f7..1f480577d 100644
--- a/app/views/editor/level/thangs_tab_view.coffee
+++ b/app/views/editor/level/thangs_tab_view.coffee
@@ -35,7 +35,6 @@ module.exports = class ThangsTabView extends View
     'surface:mouse-moved': 'onSurfaceMouseMoved'
     'surface:mouse-over': 'onSurfaceMouseOver'
     'surface:mouse-out': 'onSurfaceMouseOut'
-    'level-loaded': 'onLevelLoaded'
     'edit-level-thang': 'editThang'
     'level-thang-edited': 'onLevelThangEdited'
     'level-thang-done-editing': 'onLevelThangDoneEditing'
@@ -68,6 +67,7 @@ module.exports = class ThangsTabView extends View
     @thangTypes = @supermodel.loadCollection(new ThangTypeSearchCollection(), 'thangs').model
     # just loading all Components for now: https://github.com/codecombat/codecombat/issues/405
     @componentCollection = @supermodel.loadCollection(new ComponentsCollection(), 'components').load()
+    @level = options.level
 
     $(document).bind 'contextmenu', @preventDefaultContextMenu
     
@@ -113,7 +113,7 @@ module.exports = class ThangsTabView extends View
     @$el.find('#extant-thangs-filter button:first').button('toggle')
     $(window).resize @onWindowResize
     @addThangsView = @insertSubView new AddThangsView world: @world, supermodel: @supermodel
-    @onLevelLoaded() # refactor to not have this trigger when this view re-renders?
+    @buildInterface() # refactor to not have this trigger when this view re-renders?
 
   onFilterExtantThangs: (e) ->
     @$el.find('#extant-thangs-filter button.active').button('toggle')
@@ -127,7 +127,7 @@ module.exports = class ThangsTabView extends View
     @scrollTop += (if e.deltaY < 0 then 1 else -1) * 30
     e.preventDefault()
 
-  onLevelLoaded: (e) ->
+  buildInterface: (e) ->
     @level = e.level if e
 
     data = $.extend(true, {}, @level.attributes)