Sort tabs with jQuery UI

scribtex · May 20, 2012 · b4784c2 · b4784c2
1 parent 066389b
commit b4784c2
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 12 deletions.
diff --git a/public/editor/components/dialog/dialog.js b/public/editor/components/dialog/dialog.js
@@ -9,7 +9,8 @@ define(function() {
       this.$el.append(this.dialog);
       this.dialog.modal({
         show     : false,
-        keyboard : false
+        keyboard : false,
+        backdrop : "static" // Don't close on click
       });
       this.dialog.hide();
     },

diff --git a/public/editor/components/tabs/tabs.js b/public/editor/components/tabs/tabs.js
@@ -12,6 +12,8 @@ define(["components/base", "lib/path_util"], function(Base, PathUtil) {
       //       tabPaneEl : ...  // The jQuery wrapped element of the tab pane
       //     }
       this.openTabs = {};
+
+      $("#tab-bar").sortable();
     },
 
     open : function(file, fileView) {
@@ -59,17 +61,25 @@ define(["components/base", "lib/path_util"], function(Base, PathUtil) {
       delete this.openTabs[file.id];
       editor.get("openFiles").remove(file);
 
-      // Open the previous tab
-      var previousTabEl = tab.tabEl.prev();
-      if (previousTabEl.length > 0) {
-        setTimeout(function() {
-          previousTabEl.find("a").tab("show");
-        }, 10);
-      } else {
-        editor.set({
-          openFile     : null,
-          openFileView : null
-        })
+      // If the tab is currently selected we open either the previous of
+      // next tab (unless there are no more tabs!)
+      if (tab.tabEl.hasClass("active")) {
+        var previousTabEl = tab.tabEl.prev();
+        var nextTabEl = tab.tabEl.next();
+        if (previousTabEl.length > 0) {
+          setTimeout(function() {
+            previousTabEl.find("a").tab("show");
+          }, 10);
+        } else if (nextTabEl.length > 0) {
+          setTimeout(function() {
+            nextTabEl.find("a").tab("show");
+          }, 10);
+        } else {
+          editor.set({
+            openFile     : null,
+            openFileView : null
+          })
+        }
       }
 
       tab.tabEl.prev().tab("show")

diff --git a/public/editor/index.html b/public/editor/index.html
@@ -9,6 +9,7 @@
     <link rel="stylesheet" href='/editor/bootstrap/bootstrap/css/bootstrap.css'></link>
 
     <script src='/editor/support/jquery-1.7.2.min.js'></script>  
+    <script src='/editor/support/jquery-ui-1.8.20.min.js'></script>  
     <script src='/editor/bootstrap/js/bootstrap-dropdown.js'></script>  
     <script src='/editor/bootstrap/js/bootstrap-modal.js'></script>  
     <script src='/editor/bootstrap/js/bootstrap-tab.js'></script>  

diff --git a/public/editor/support/jquery-ui-1.8.20.min.js b/public/editor/support/jquery-ui-1.8.20.min.js