From 4474f2bc2d723142d8b4f1c1a09d9799db849eee Mon Sep 17 00:00:00 2001
From: Justin Palmer <justin@github.com>
Date: Sun, 10 Feb 2013 11:12:14 -0800
Subject: [PATCH] rename Tabs -> TabView

---
 .../tabs/lib/{tabs-view.coffee => tab-view.coffee}    | 11 ++++++-----
 src/packages/tabs/package.cson                        |  2 +-
 src/packages/tabs/spec/tabs-spec.coffee               |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename src/packages/tabs/lib/{tabs-view.coffee => tab-view.coffee} (91%)

diff --git a/src/packages/tabs/lib/tabs-view.coffee b/src/packages/tabs/lib/tab-view.coffee
similarity index 91%
rename from src/packages/tabs/lib/tabs-view.coffee
rename to src/packages/tabs/lib/tab-view.coffee
index 6441224f5..3d9b07f3e 100644
--- a/src/packages/tabs/lib/tabs-view.coffee
+++ b/src/packages/tabs/lib/tab-view.coffee
@@ -3,14 +3,14 @@ SortableList = require 'sortable-list'
 Tab = require 'tabs/lib/tab'
 
 module.exports =
-class Tabs extends SortableList
+class TabView extends SortableList
   @activate: ->
     rootView.eachEditor (editor) =>
       @prependToEditorPane(rootView, editor) if editor.attached
 
   @prependToEditorPane: (rootView, editor) ->
     if pane = editor.pane()
-      pane.prepend(new Tabs(editor))
+      pane.prepend(new TabView(editor))
 
   @content: ->
     @ul class: "tabs #{@viewClass()}"
@@ -73,15 +73,16 @@ class Tabs extends SortableList
       toEditor = toPane.find('.editor').view()
 
     droppedNearTab = @getSortableElement(event)
-    draggedTab     = fromPane.find(".#{Tabs.viewClass()} .sortable:eq(#{previousDraggedTabIndex})")
+    draggedTab     = fromPane.find(".#{TabView.viewClass()} .sortable:eq(#{previousDraggedTabIndex})")
 
     draggedTab.remove()
     draggedTab.insertAfter(droppedNearTab)
-
     currentDraggedTabIndex = draggedTab.index()
     toEditor.editSessions.splice(currentDraggedTabIndex, 0, fromEditor.editSessions.splice(previousDraggedTabIndex, 1)[0])
 
     @setActiveTab(currentDraggedTabIndex)
-    fromEditor.setActiveEditSessionIndex(0) if fromPaneIndex != toPaneIndex
     toEditor.setActiveEditSessionIndex(currentDraggedTabIndex)
     toEditor.focus()
+
+    if fromPaneIndex != toPaneIndex
+      fromEditor.setActiveEditSessionIndex(0)
diff --git a/src/packages/tabs/package.cson b/src/packages/tabs/package.cson
index 6cc9d8565..0e40dfd74 100644
--- a/src/packages/tabs/package.cson
+++ b/src/packages/tabs/package.cson
@@ -1 +1 @@
-'main': 'lib/tabs-view'
+'main': 'lib/tab-view'
diff --git a/src/packages/tabs/spec/tabs-spec.coffee b/src/packages/tabs/spec/tabs-spec.coffee
index a9bc5b358..d6c708ebe 100644
--- a/src/packages/tabs/spec/tabs-spec.coffee
+++ b/src/packages/tabs/spec/tabs-spec.coffee
@@ -3,7 +3,7 @@ _ = require 'underscore'
 RootView = require 'root-view'
 fs = require 'fs'
 
-describe "Tabs", ->
+describe "TabView", ->
   [editor, buffer, tabs] = []
 
   beforeEach ->