codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-01 03:16:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/codecombat/codecombat

Browse source
This commit is contained in:
Scott Erickson 2014-03-24 09:28:06 -07:00
commit 6de62154bd
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/modal/wizard_settings_modal.coffee
View file

@ -11,7 +11,7 @@ module.exports = class WizardSettingsModal extends View
closesOnClickOutside: false closesOnClickOutside: false
constructor: (options) -> constructor: (options) ->
@onNameChange = _.debounce(@checkNameExists, 200) @onNameChange = _.debounce(@checkNameExists, 500)
super options super options
events: events:

4
app/views/play/level/tome/spell_toolbar_view.coffee
View file

@ -103,8 +103,8 @@ module.exports = class SpellToolbarView extends View
updateScroll: -> updateScroll: ->
return unless statementStart = @callState?.statements?[@statementIndex]?.range[0] return unless statementStart = @callState?.statements?[@statementIndex]?.range[0]
text = @ace.getValue() text = @ace.getValue() # code in editor
currentLine = text.substr(0, statementStart).split('\n').length - 1 currentLine = statementStart.row
@ace.scrollToLine currentLine, true, true @ace.scrollToLine currentLine, true, true
setCallState: (callState, statementIndex, @callIndex, @metrics) -> setCallState: (callState, statementIndex, @callIndex, @metrics) ->