Replace Editor.activeEditSessionIndex with activeEditSessionIndex method

This commit is contained in:
Corey Johnson & Nathan Sobo 2012-06-19 10:24:19 -07:00
parent aa10ae383b
commit 5efc853c36

View File

@ -45,6 +45,7 @@ class Editor extends View
isFocused: false isFocused: false
softTabs: true softTabs: true
tabText: ' ' tabText: ' '
activeEditSession: null
editSessions: null editSessions: null
attached: false attached: false
lineOverdraw: 100 lineOverdraw: 100
@ -84,8 +85,11 @@ class Editor extends View
serialize: -> serialize: ->
@saveActiveEditSession() @saveActiveEditSession()
editSessions = @editSessions.map (session) -> session.serialize()
{ viewClass: "Editor", editSessions, @activeEditSessionIndex, @isFocused } viewClass: "Editor"
editSessions: @editSessions.map (session) -> session.serialize()
activeEditSessionIndex: @getActiveEditSessionIndex()
isFocused: @isFocused
copy: -> copy: ->
Editor.deserialize(@serialize(), @rootView()) Editor.deserialize(@serialize(), @rootView())
@ -382,14 +386,17 @@ class Editor extends View
_.remove(@editSessions, editSession) _.remove(@editSessions, editSession)
loadNextEditSession: -> loadNextEditSession: ->
nextIndex = (@activeEditSessionIndex + 1) % @editSessions.length nextIndex = (@getActiveEditSessionIndex() + 1) % @editSessions.length
@setActiveEditSessionIndex(nextIndex) @setActiveEditSessionIndex(nextIndex)
loadPreviousEditSession: -> loadPreviousEditSession: ->
previousIndex = @activeEditSessionIndex - 1 previousIndex = @getActiveEditSessionIndex() - 1
previousIndex = @editSessions.length - 1 if previousIndex < 0 previousIndex = @editSessions.length - 1 if previousIndex < 0
@setActiveEditSessionIndex(previousIndex) @setActiveEditSessionIndex(previousIndex)
getActiveEditSessionIndex: ->
return index for session, index in @editSessions when session == @activeEditSession
setActiveEditSessionIndex: (index) -> setActiveEditSessionIndex: (index) ->
throw new Error("Edit session not found") unless @editSessions[index] throw new Error("Edit session not found") unless @editSessions[index]
@ -398,7 +405,6 @@ class Editor extends View
@activeEditSession.off() @activeEditSession.off()
@activeEditSession = @editSessions[index] @activeEditSession = @editSessions[index]
@activeEditSessionIndex = index
@unsubscribeFromBuffer() if @buffer @unsubscribeFromBuffer() if @buffer
@buffer = @activeEditSession.buffer @buffer = @activeEditSession.buffer