codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-23 23:58:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Destroy vim mode option

Browse source
This commit is contained in:
Nick Winter 2016-05-30 17:08:11 -07:00
parent 6f63de5ec8
commit 88a07b5c09
4 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/locale/en.coffee
View file

@ -711,9 +711,6 @@
music_label: "Music" music_label: "Music"
music_description: "Turn background music on/off." music_description: "Turn background music on/off."
editor_config_title: "Editor Configuration" editor_config_title: "Editor Configuration"
editor_config_keybindings_label: "Key Bindings"
editor_config_keybindings_default: "Default (Ace)"
editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
editor_config_livecompletion_label: "Live Autocompletion" editor_config_livecompletion_label: "Live Autocompletion"
editor_config_livecompletion_description: "Displays autocomplete suggestions while typing." editor_config_livecompletion_description: "Displays autocomplete suggestions while typing."
editor_config_invisibles_label: "Show Invisibles" editor_config_invisibles_label: "Show Invisibles"

4
app/schemas/models/user.coffee
View file

@ -121,7 +121,7 @@ _.extend UserSchema.properties,
aceConfig: c.object { default: { language: 'python', keyBindings: 'default', invisibles: false, indentGuides: false, behaviors: false, liveCompletion: true }}, aceConfig: c.object { default: { language: 'python', keyBindings: 'default', invisibles: false, indentGuides: false, behaviors: false, liveCompletion: true }},
language: {type: 'string', 'enum': ['python', 'javascript', 'coffeescript', 'clojure', 'lua', 'java', 'io']} language: {type: 'string', 'enum': ['python', 'javascript', 'coffeescript', 'clojure', 'lua', 'java', 'io']}
keyBindings: {type: 'string', 'enum': ['default', 'vim', 'emacs']} keyBindings: {type: 'string', 'enum': ['default', 'vim', 'emacs']} # Deprecated 2016-05-30; now we just always give them 'default'.
invisibles: {type: 'boolean' } invisibles: {type: 'boolean' }
indentGuides: {type: 'boolean' } indentGuides: {type: 'boolean' }
behaviors: {type: 'boolean' } behaviors: {type: 'boolean' }
@ -337,7 +337,7 @@ _.extend UserSchema.properties,
} }
} }
enrollmentRequestSent: { type: 'boolean' } enrollmentRequestSent: { type: 'boolean' }
schoolName: {type: 'string'} schoolName: {type: 'string'}
role: {type: 'string', enum: ["God", "advisor", "parent", "principal", "student", "superintendent", "teacher", "technology coordinator"]} role: {type: 'string', enum: ["God", "advisor", "parent", "principal", "student", "superintendent", "teacher", "technology coordinator"]}
birthday: c.stringDate({title: "Birthday"}) birthday: c.stringDate({title: "Birthday"})

8
app/templates/play/menu/options-view.jade
View file

@ -26,14 +26,6 @@
h3(data-i18n="options.editor_config_title") Editor Configuration h3(data-i18n="options.editor_config_title") Editor Configuration
.form-group.select-group
label.control-label(for="option-key-bindings", data-i18n="options.editor_config_keybindings_label") Key Bindings
select#option-key-bindings.form-control(name="keyBindings")
option(value="default", selected=(aceConfig.keyBindings === "default"), data-i18n="options.editor_config_keybindings_default") Default (Ace)
option(value="vim", selected=(aceConfig.keyBindings === "vim")) Vim
option(value="emacs", selected=(aceConfig.keyBindings === "emacs")) Emacs
span.help-block(data-i18n="options.editor_config_keybindings_description") Adds additional shortcuts known from the common editors.
.form-group.checkbox .form-group.checkbox
label(for="option-live-completion") label(for="option-live-completion")
input#option-live-completion(name="liveCompletion", type="checkbox", checked=aceConfig.liveCompletion) input#option-live-completion(name="liveCompletion", type="checkbox", checked=aceConfig.liveCompletion)

5
app/views/play/menu/OptionsView.coffee
View file

@ -20,8 +20,7 @@ module.exports = class OptionsView extends CocoView
events: events:
'change #option-music': 'updateMusic' 'change #option-music': 'updateMusic'
'change #option-key-bindings': 'updateInvisibles' 'change #option-invisibles': 'updateInvisibles'
'change #option-key-bindings': 'updateKeyBindings'
'change #option-indent-guides': 'updateIndentGuides' 'change #option-indent-guides': 'updateIndentGuides'
'change #option-behaviors': 'updateBehaviors' 'change #option-behaviors': 'updateBehaviors'
'change #option-live-completion': 'updateLiveCompletion' 'change #option-live-completion': 'updateLiveCompletion'
@ -67,7 +66,7 @@ module.exports = class OptionsView extends CocoView
if @playerName and @playerName isnt me.get('name') if @playerName and @playerName isnt me.get('name')
me.set 'name', @playerName me.set 'name', @playerName
@aceConfig.invisibles = @$el.find('#option-invisibles').prop('checked') @aceConfig.invisibles = @$el.find('#option-invisibles').prop('checked')
@aceConfig.keyBindings = @$el.find('#option-key-bindings').val() @aceConfig.keyBindings = 'default' # We used to give them the option, but we took it away.
@aceConfig.indentGuides = @$el.find('#option-indent-guides').prop('checked') @aceConfig.indentGuides = @$el.find('#option-indent-guides').prop('checked')
@aceConfig.behaviors = @$el.find('#option-behaviors').prop('checked') @aceConfig.behaviors = @$el.find('#option-behaviors').prop('checked')
@aceConfig.liveCompletion = @$el.find('#option-live-completion').prop('checked') @aceConfig.liveCompletion = @$el.find('#option-live-completion').prop('checked')