Merge branch 'rubenvereecken-issue1061'

app/views/editor/level/scripts_tab_view.coffee

@@ -152,32 +152,6 @@ class EventPrereqNode extends TreemaNode.nodeMap.object
 class ChannelNode extends TreemaNode.nodeMap.string
   buildValueForEditing: (valEl) ->
     super(valEl)
-    valEl.find('input').autocomplete(source: channels, minLength: 0, delay: 0, autoFocus: true)
+    autocompleteValues = ({label: val?.title or key, value: key} for key, val of Backbone.Mediator.channelSchemas)
+    valEl.find('input').autocomplete(source: autocompleteValues, minLength: 0, delay: 0, autoFocus: true)
     valEl
-
-channels = [
-  "tome:palette-hovered",
-  "tome:palette-clicked",
-  "tome:spell-shown",
-  "end-current-script",
-  "goal-manager:new-goal-states",
-  "god:new-world-created",
-  "help-multiplayer",
-  "help-next",
-  "help-overview",
-  "level-restart-ask",
-  "level-set-playing",
-  "level:docs-hidden",
-  "level:team-set",
-  "playback:manually-scrubbed",
-  "sprite:speech-updated",
-  "surface:coordinates-shown",
-  "surface:frame-changed",
-  "surface:sprite-selected",
-  "world:thang-attacked-when-out-of-range",
-  "world:thang-collected-item",
-  "world:thang-died",
-  "world:thang-left-map",
-  "world:thang-touched-goal",
-  "world:won"
-]

app/views/editor/level/thangs_tab_view.coffee

@@ -250,7 +250,7 @@ module.exports = class ThangsTabView extends View
 #      @thangsTreema.deselectAll()
 
   selectAddThang: (e) =>
-    return if $(e.target).closest('#thang-search').length # Ignore if you're trying to search thangs
+    return if e? and $(e.target).closest('#thang-search').length # Ignore if you're trying to search thangs
     return unless e? and $(e.target).closest('#editor-level-thangs-tab-view').length or key.isPressed('esc')
     if e then target = $(e.target) else target = @$el.find('.add-thangs-palette')  # pretend to click on background if no event
     return true if target.attr('id') is 'surface'