codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-30 07:53:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'rishiloyola-patch-4'

Browse source
This commit is contained in:
Nick Winter 2014-12-24 12:37:51 -08:00
commit 95f76ae9d8
1 changed files with 10 additions and 4 deletions

14
app/views/play/level/tome/SpellView.coffee
View file

@ -215,7 +215,11 @@ module.exports = class SpellView extends CocoView
addCommand addCommand
name: 'disable-spaces' name: 'disable-spaces'
bindKey: 'Space' bindKey: 'Space'
exec: => @ace.execCommand 'insertstring', ' ' unless LevelOptions[@options.level.get('slug')]?.disableSpaces exec: =>
return @ace.execCommand 'insertstring', ' ' unless LevelOptions[@options.level.get('slug')]?.disableSpaces
line = @aceDoc.getLine @ace.getCursorPosition().row
return @ace.execCommand 'insertstring', ' ' if @singleLineCommentRegex().test line
addCommand addCommand
name: 'throttle-backspaces' name: 'throttle-backspaces'
bindKey: 'Backspace' bindKey: 'Backspace'
@ -781,7 +785,9 @@ module.exports = class SpellView extends CocoView
@recompile() @recompile()
singleLineCommentRegex: -> singleLineCommentRegex: ->
return @_singleLineCommentRegex if @_singleLineCommentRegex if @_singleLineCommentRegex
@_singleLineCommentRegex.lastIndex = 0
return @_singleLineCommentRegex
commentStarts = commentStarts =
javascript: '//' javascript: '//'
python: '#' python: '#'
@ -790,8 +796,8 @@ module.exports = class SpellView extends CocoView
lua: '--' lua: '--'
io: '//' io: '//'
commentStart = commentStarts[@spell.language] or '//' commentStart = commentStarts[@spell.language] or '//'
@_singleLineCommentRegexp ?= new RegExp "[ \t]*#{commentStart}[^\"'\n]*", 'g' @_singleLineCommentRegex = new RegExp "[ \t]*#{commentStart}[^\"'\n]*", 'g'
@_singleLineCommentRegexp @_singleLineCommentRegex
preload: -> preload: ->
# Send this code over to the God for preloading, but don't change the cast state. # Send this code over to the God for preloading, but don't change the cast state.