Merge branch 'master' of https://github.com/codecombat/codecombat

app/views/editor/components/main.coffee

@@ -18,6 +18,7 @@ module.exports = class ThangComponentEditView extends CocoView
     @callback = options.callback
 
   render: =>
+    return if @destroyed
     for model in [Level, LevelComponent]
       (new model()).on 'schema-loaded', @render unless model.schema?.loaded
     if not @componentCollection
@@ -35,6 +36,7 @@ module.exports = class ThangComponentEditView extends CocoView
     @buildAddComponentTreema()
 
   onComponentsSync: =>
+    return if @destroyed
     @supermodel.addCollection @componentCollection
     @render()
 

app/views/play/level/control_bar_view.coffee

@@ -54,7 +54,7 @@ module.exports = class ControlBarView extends View
     c.ladderGame = @ladderGame
     c.homeLink = "/"
     levelID = @level.get('slug')
-    if levelID in ["brawlwood", "brawlwood-tutorial"]
+    if levelID in ["brawlwood", "brawlwood-tutorial", "dungeon-arena"]
       levelID = 'brawlwood' if levelID is 'brawlwood-tutorial'
       c.homeLink = "/play/ladder/" + levelID
     c

app/views/play/level/tome/cast_button_view.coffee

@@ -35,7 +35,7 @@ module.exports = class CastButtonView extends View
     # TODO: use a User setting instead of localStorage
     delay = localStorage.getItem 'autocastDelay'
     delay ?= 5000
-    if @levelID in ['brawlwood', 'brawlwood-tutorial']
+    if @levelID in ['brawlwood', 'brawlwood-tutorial', 'dungeon-arena']
       delay = 90019001
     @setAutocastDelay delay
 

app/views/play/level/tome/tome_view.coffee

@@ -130,6 +130,7 @@ module.exports = class TomeView extends View
         unless method.cloneOf
           skipProtectAPI = @getQueryVariable("skip_protect_api") is "true" or @options.levelID isnt 'brawlwood'
           skipProtectAPI = true  # gah, it's so slow :( and somehow still affects simulation
+          #skipProtectAPI = false if @options.levelID is 'dungeon-arena'
           skipFlow = @getQueryVariable("skip_flow") is "true" or @options.levelID is 'brawlwood'
           spell = @spells[spellKey] = new Spell programmableMethod: method, spellKey: spellKey, pathComponents: pathPrefixComponents.concat(pathComponents), session: @options.session, supermodel: @supermodel, skipFlow: skipFlow, skipProtectAPI: skipProtectAPI, worker: @worker
     for thangID, spellKeys of @thangSpells