diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee index f53f407fd..899a73ba5 100644 --- a/spec/app/editor-spec.coffee +++ b/spec/app/editor-spec.coffee @@ -2589,14 +2589,14 @@ describe "Editor", -> expect(buffer.lineForRow(15)).toBeUndefined() expect(editor.getCursorBufferPosition()).toEqual [14, 0] - describe ".moveEditSessionAtIndex(fromIndex, toIndex)", -> + describe ".moveEditSessionToIndex(fromIndex, toIndex)", -> it "updates the edit session order", -> jsPath = editor.getPath() rootView.open("sample.txt") txtPath = editor.getPath() expect(editor.editSessions[0].getPath()).toBe jsPath expect(editor.editSessions[1].getPath()).toBe txtPath - editor.moveEditSessionAtIndex(0, 1) + editor.moveEditSessionToIndex(0, 1) expect(editor.editSessions[0].getPath()).toBe txtPath expect(editor.editSessions[1].getPath()).toBe jsPath @@ -2604,7 +2604,7 @@ describe "Editor", -> eventHandler = jasmine.createSpy("eventHandler") rootView.open("sample.txt") editor.on "editor:edit-session-order-changed", eventHandler - editor.moveEditSessionAtIndex(0, 1) + editor.moveEditSessionToIndex(0, 1) expect(eventHandler).toHaveBeenCalled() it "sets the moved session as the editor's active session", -> @@ -2612,5 +2612,5 @@ describe "Editor", -> rootView.open("sample.txt") txtPath = editor.getPath() expect(editor.activeEditSession.getPath()).toBe txtPath - editor.moveEditSessionAtIndex(0, 1) + editor.moveEditSessionToIndex(0, 1) expect(editor.activeEditSession.getPath()).toBe jsPath diff --git a/src/app/editor.coffee b/src/app/editor.coffee index c6fbcc44d..80ed42943 100644 --- a/src/app/editor.coffee +++ b/src/app/editor.coffee @@ -549,7 +549,7 @@ class Editor extends View "Cancel" ) - moveEditSessionAtIndex: (fromIndex, toIndex) -> + moveEditSessionToIndex: (fromIndex, toIndex) -> return if fromIndex is toIndex editSession = @editSessions.splice(fromIndex, 1) @editSessions.splice(toIndex, 0, editSession[0]) @@ -561,10 +561,7 @@ class Editor extends View toEditSession = fromEditSession.copy() @destroyEditSessionIndex(fromIndex) toEditor.edit(toEditSession) - toEditor.moveEditSessionAtIndex(toEditor.getActiveEditSessionIndex(), toIndex) - - transferEditSessionAtIndex: (fromIndex, toIndex, toEditor) -> - toEditor.editSessions.splice(toIndex, 0, @editSessions.splice(fromIndex, 1)[0]) + toEditor.moveEditSessionToIndex(toEditor.getActiveEditSessionIndex(), toIndex) activateEditSessionForPath: (path) -> for editSession, index in @editSessions diff --git a/src/packages/tabs/lib/tab-view.coffee b/src/packages/tabs/lib/tab-view.coffee index 6cc84b63a..b15fb40ef 100644 --- a/src/packages/tabs/lib/tab-view.coffee +++ b/src/packages/tabs/lib/tab-view.coffee @@ -86,7 +86,7 @@ class TabView extends SortableList fromIndex = draggedTab.index() toIndex = droppedNearTab.index() toIndex++ if fromIndex > toIndex - fromEditor.moveEditSessionAtIndex(fromIndex, toIndex) + fromEditor.moveEditSessionToIndex(fromIndex, toIndex) else toPane = $(rootView.find('.pane')[toPaneIndex]) toEditor = toPane.find('.editor').view() diff --git a/src/packages/tabs/spec/tabs-spec.coffee b/src/packages/tabs/spec/tabs-spec.coffee index 1db15106e..31aff09e6 100644 --- a/src/packages/tabs/spec/tabs-spec.coffee +++ b/src/packages/tabs/spec/tabs-spec.coffee @@ -150,11 +150,11 @@ describe "TabView", -> expect(tabs.find('.tab:eq(0) .file-name').text()).toBe "sample.js" expect(tabs.find('.tab:eq(1) .file-name').text()).toBe "sample.txt" - editor.moveEditSessionAtIndex(0, 1) + editor.moveEditSessionToIndex(0, 1) expect(tabs.find('.tab:eq(0) .file-name').text()).toBe "sample.txt" expect(tabs.find('.tab:eq(1) .file-name').text()).toBe "sample.js" - editor.moveEditSessionAtIndex(1, 0) + editor.moveEditSessionToIndex(1, 0) expect(tabs.find('.tab:eq(0) .file-name').text()).toBe "sample.js" expect(tabs.find('.tab:eq(1) .file-name').text()).toBe "sample.txt"