From 5abf17e93bf1e772f3a1600b2e9a890ec65fc14e Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 11 Feb 2013 17:00:46 -0800 Subject: [PATCH] Compare edit sessions instead of tab paths --- src/packages/tabs/lib/tab-view.coffee | 10 ++++------ src/packages/tabs/lib/tab.coffee | 3 --- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/packages/tabs/lib/tab-view.coffee b/src/packages/tabs/lib/tab-view.coffee index feffd624c..1ddf6182c 100644 --- a/src/packages/tabs/lib/tab-view.coffee +++ b/src/packages/tabs/lib/tab-view.coffee @@ -44,11 +44,9 @@ class TabView extends SortableList removeTabAtIndex: (index) -> @find(".tab:eq(#{index})").remove() - containsTab: (tab) -> - path = $(tab).view().representedPath() - paths = $.makeArray(@find('.tab')).map (e) -> $(e).view().representedPath() - - return paths.some (tabpath) -> tabpath == path + containsEditSession: (editor, editSession) -> + for session in editor.editSessions + return true if editSession.getPath() is session.getPath() shouldAllowDrag: (event) -> panes = rootView.find('.pane') @@ -84,7 +82,7 @@ class TabView extends SortableList return if draggedTab.is(droppedNearTab) if fromPaneIndex != toPaneIndex - return if toPane.find('.sortable-list').view().containsTab(draggedTab) + return if @containsEditSession(toEditor, fromEditor.editSessions[draggedTab.index()]) draggedTab.remove() draggedTab.insertAfter(droppedNearTab) diff --git a/src/packages/tabs/lib/tab.coffee b/src/packages/tabs/lib/tab.coffee index 0ef06d7d4..bcc055f1d 100644 --- a/src/packages/tabs/lib/tab.coffee +++ b/src/packages/tabs/lib/tab.coffee @@ -39,6 +39,3 @@ class Tab extends View @fileName.text(fileNameText) @fileName.attr('title', @editSession.getPath()) - - representedPath: -> - @buffer.getPath()