From ec0027043b866e6e06e75503cd55e915f6cd265e Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Mon, 26 May 2014 08:59:48 -0700 Subject: [PATCH] Added experimental Io language from Aether. --- app/schemas/models/user.coffee | 2 +- app/views/play/level/modal/editor_config_modal.coffee | 1 + app/views/play/level/tome/spell_view.coffee | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/schemas/models/user.coffee b/app/schemas/models/user.coffee index bf4072469..a6525bf91 100644 --- a/app/schemas/models/user.coffee +++ b/app/schemas/models/user.coffee @@ -60,7 +60,7 @@ UserSchema = c.object {}, colorConfig: c.object {additionalProperties: c.colorConfig()} aceConfig: c.object {}, - language: {type: 'string', 'default': 'javascript', 'enum': ['javascript', 'coffeescript', 'clojure', 'lua', 'python']} + language: {type: 'string', 'default': 'javascript', 'enum': ['javascript', 'coffeescript', 'clojure', 'lua', 'python', 'io']} keyBindings: {type: 'string', 'default': 'default', 'enum': ['default', 'vim', 'emacs']} invisibles: {type: 'boolean', 'default': false} indentGuides: {type: 'boolean', 'default': false} diff --git a/app/views/play/level/modal/editor_config_modal.coffee b/app/views/play/level/modal/editor_config_modal.coffee index 5047be476..a90afad08 100644 --- a/app/views/play/level/modal/editor_config_modal.coffee +++ b/app/views/play/level/modal/editor_config_modal.coffee @@ -35,6 +35,7 @@ module.exports = class EditorConfigModal extends View {id: 'python', name: 'Python (Experimental)'} {id: 'clojure', name: 'Clojure (Experimental)'} {id: 'lua', name: 'Lua (Experimental)'} + {id: 'io', name: 'Io (Experimental)'} ] c.sessionLanguage = @session.get('codeLanguage') ? @aceConfig.language c.language = @aceConfig.language diff --git a/app/views/play/level/tome/spell_view.coffee b/app/views/play/level/tome/spell_view.coffee index 75f559bdf..f42ecb121 100644 --- a/app/views/play/level/tome/spell_view.coffee +++ b/app/views/play/level/tome/spell_view.coffee @@ -21,6 +21,7 @@ module.exports = class SpellView extends View 'clojure': 'ace/mode/clojure' 'lua': 'ace/mode/lua' 'python': 'ace/mode/python' + 'io': 'ace/mode/text' keyBindings: 'default': null