diff --git a/app/views/play/level/modal/editor_config_modal.coffee b/app/views/play/level/modal/editor_config_modal.coffee index 6eee66071..6be98b44d 100644 --- a/app/views/play/level/modal/editor_config_modal.coffee +++ b/app/views/play/level/modal/editor_config_modal.coffee @@ -62,7 +62,7 @@ module.exports = class EditorConfigModal extends View @aceConfig.behaviors = @$el.find('#tome-behaviors').prop('checked') me.set 'aceConfig', @aceConfig Backbone.Mediator.publish 'tome:change-config' - Backbone.Mediator.publish 'tome:change-language' unless @aceConfig.language is oldLanguage + Backbone.Mediator.publish 'tome:change-language' unless @aceConfig.language isnt oldLanguage me.save() destroy: -> diff --git a/app/views/play/level/tome/spell.coffee b/app/views/play/level/tome/spell.coffee index b18263e9f..a0cb680cb 100644 --- a/app/views/play/level/tome/spell.coffee +++ b/app/views/play/level/tome/spell.coffee @@ -85,7 +85,7 @@ module.exports = class Spell aether.hasChangedSignificantly (newSource ? @originalSource), (currentSource ? @source), true, true createAether: (thang) -> - aceConfig = me.get 'aceConfig' ? {} + aceConfig = me.get('aceConfig') ? {} aetherOptions = problems: jshint_W040: {level: "ignore"} @@ -110,7 +110,7 @@ module.exports = class Spell aether updateLanguageAether: -> - aceConfig = me.get 'aceConfig' ? {} + aceConfig = me.get('aceConfig') ? {} for thangId, spellThang of @thangs spellThang.aether?.setLanguage (aceConfig.language ? 'javascript') spellThang.castAether = null diff --git a/app/views/play/level/tome/spell_view.coffee b/app/views/play/level/tome/spell_view.coffee index 4319981d8..17a813459 100644 --- a/app/views/play/level/tome/spell_view.coffee +++ b/app/views/play/level/tome/spell_view.coffee @@ -17,7 +17,7 @@ module.exports = class SpellView extends View editModes: 'javascript': 'ace/mode/javascript' - 'coffeescript': 'ace/mode/coffeescript' + 'coffeescript': 'ace/mode/coffee' keyBindings: 'default': null @@ -567,14 +567,14 @@ module.exports = class SpellView extends View @ace.setValue pretty onChangeEditorConfig: (e) -> - aceConfig = me.get 'aceConfig' + aceConfig = me.get('aceConfig') ? {} @ace.setDisplayIndentGuides aceConfig.indentGuides # default false @ace.setShowInvisibles aceConfig.invisibles # default false @ace.setKeyboardHandler @keyBindings[aceConfig.keyBindings ? 'default'] - @aceSession.setMode @editModes[aceConfig.language ? 'javascript'] + # @aceSession.setMode @editModes[aceConfig.language ? 'javascript'] onChangeLanguage: (e) -> - aceConfig = me.get 'aceConfig' + aceConfig = me.get('aceConfig') ? {} @aceSession.setMode @editModes[aceConfig.language ? 'javascript'] dismiss: -> diff --git a/app/views/play/level/tome/tome_view.coffee b/app/views/play/level/tome/tome_view.coffee index a4e3f8c2b..5c92a9bcf 100644 --- a/app/views/play/level/tome/tome_view.coffee +++ b/app/views/play/level/tome/tome_view.coffee @@ -218,7 +218,7 @@ module.exports = class TomeView extends View Backbone.Mediator.publish 'tome:cast-spells', spells: @spells updateLanguageForAllSpells: -> - spell.updateLanguageAether for spellKey, spell of @spells + spell.updateLanguageAether() for spellKey, spell of @spells destroy: -> spell.destroy() for spellKey, spell of @spells