Merge pull request #938 from ajaxorg/ext/tab_closing

Add close all to right/left to tabs; incl. filename in Save warning

Author: Sergi Mansilla

client/ext/save/save.js

@@ -37,7 +37,7 @@ module.exports = ext.register("ext/save/save", {
         if (!self.tabEditors) return;
 
         var _self = this;
-
+        
         tabEditors.addEventListener("close", this.$close = function(e) {
             var at = e.page.$at;
             if (!at.undo_ptr)
@@ -47,11 +47,17 @@ module.exports = ext.register("ext/save/save", {
               || !at.undo_ptr && node.getAttribute("changed") == 1
               && e.page.$doc.getValue()) {
                 ext.initExtension(_self);
-
+                
+                var pages   = tabEditors.getPages(),
+                currIdx = pages.indexOf(e.page);
+                tabEditors.set(pages[currIdx].id); //jump to file
+                
                 winCloseConfirm.page = e.page;
                 winCloseConfirm.all  = -100;
                 winCloseConfirm.show();
 
+                winCloseConfirm.childNodes[0].$ext.innerHTML = "<h3>Save " + node.getAttribute("path") + "?</h3><div>This file has unsaved changes. Your changes will be lost if you don't save them.</div>";
+                
                 winCloseConfirm.addEventListener("hide", function(){
                     if (winCloseConfirm.all != -100) {
                         var f = function(resetUndo){
@@ -78,7 +84,7 @@ module.exports = ext.register("ext/save/save", {
 
                     winCloseConfirm.removeEventListener("hide", arguments.callee);
                 });
-
+                
                 btnYesAll.hide();
                 btnNoAll.hide();
 

client/ext/save/save.xml

@@ -1,7 +1,7 @@
 <a:application xmlns:a="http://ajax.org/2005/aml">
     <a:window
       id        = "winCloseConfirm"
-      title     = "Would you like to save this file?"
+      title     = "Save this file?"
       icon      = ""
       center    = "true"
       render    = "runtime"
@@ -17,9 +17,8 @@
             btnSaveNo.dispatchEvent('click', {htmlEvent: {}});
         }
       ">
-        <a:vbox padding="10" edge="15 20 25 20">
-            <h3 class="wheader">Save this file?</h3>
-            <div>This file has unsaved changes. Would you like to save the file before closing?</div>
+        <a:vbox id="fileTitle" padding="10" edge="15 20 25 20">
+            
         </a:vbox>
 
         <a:hbox edge="6 10 10" pack="end" padding="8">

client/ext/tabbehaviors/tabbehaviors.js

@@ -79,6 +79,20 @@ module.exports = ext.register("ext/tabbehaviors/tabbehaviors", {
                 },
                 disabled : "{!!!tabEditors.activepage}"
             })),
+            mnuTabs.appendChild(new apf.item({
+                caption : "Close Tabs to the Right",
+                onclick : function() {
+                    _self.closealltotheright();
+                },
+                disabled : "{!!!tabEditors.activepage}"
+            })),
+            mnuTabs.appendChild(new apf.item({
+                caption : "Close Tabs to the Left",
+                onclick : function() {
+                    _self.closealltotheleft();
+                },
+                disabled : "{!!!tabEditors.activepage}"
+            })),
             //mnuTabs.appendChild(new apf.divider()),
             apf.document.body.appendChild(new apf.menu({
                 id : "mnuContextTabs",
@@ -104,18 +118,50 @@ module.exports = ext.register("ext/tabbehaviors/tabbehaviors", {
                         onclick : function() {
                             _self.closeallbutme(tabEditors.contextPage);
                         }
+                    }),
+                    new apf.item({
+                        caption : "Close Tabs to the Right",
+                        onclick : function() {
+                            _self.closealltotheright();
+                        }
+                    }),
+                    new apf.item({
+                        caption : "Close Tabs to the Left",
+                        onclick : function() {
+                            _self.closealltotheleft();
+                        }
                     })
                 ]
             }))
         );
-
+        
         this.hotitems.revealtab     = [this.nodes[0], mnuContextTabs.childNodes[0]];
         this.hotitems.closetab      = [this.nodes[1], mnuContextTabs.childNodes[1]];
         this.hotitems.closealltabs  = [this.nodes[2], mnuContextTabs.childNodes[2]];
         this.hotitems.closeallbutme = [this.nodes[3], mnuContextTabs.childNodes[3]];
-
+        this.hotitems.closealltotheright = [this.nodes[4], mnuContextTabs.childNodes[4]];
+        this.hotitems.closealltotheleftt = [this.nodes[5], mnuContextTabs.childNodes[5]];
+        
         tabEditors.setAttribute("contextmenu", "mnuContextTabs");
 
+        mnuContextTabs.addEventListener("prop.visible", function(e) {
+            var page = tabEditors.getPage();
+            var pages = tabEditors.getPages();
+            
+            // be optimistic, reset menu items to disabled
+            mnuContextTabs.childNodes[4].setAttribute('disabled', false);
+            mnuContextTabs.childNodes[5].setAttribute('disabled', false);
+                
+            // if last tab, remove "close to the right"
+            if (page.nextSibling.localName !== "page") {
+                mnuContextTabs.childNodes[4].setAttribute('disabled', true);
+            }
+            // if first tab, remove "close to the left"
+            else if (pages.indexOf(page) == 0) {
+                mnuContextTabs.childNodes[5].setAttribute('disabled', true);
+            }
+        });
+        
         tabEditors.addEventListener("close", function(e) {
             if (!e || !e.htmlEvent)
                 return;
@@ -231,8 +277,9 @@ module.exports = ext.register("ext/tabbehaviors/tabbehaviors", {
         for (var i = 0, l = pages.length; i < l; i++) {
             page = pages[i];
 
-            if (ignore && page == ignore)
+            if (ignore && (page == ignore || ignore.hasOwnProperty(i))) {
                 continue;
+            }
 
             if (page.$doc.getNode().getAttribute("changed") == "1") {
                 page.noAnim = true; // turn off animation on closing tab
@@ -282,6 +329,34 @@ module.exports = ext.register("ext/tabbehaviors/tabbehaviors", {
             callback();
     },
 
+    closealltotheright : function() {
+        var page = tabEditors.getPage();
+        var pages = tabEditors.getPages();
+    
+        var currIdx = pages.indexOf(page);
+        var ignore = {};
+            
+        for (var j = 0; j <= currIdx; j++) {
+            ignore[j] = page;
+        }
+
+        this.closeallbutme(ignore);
+    },
+
+    closealltotheleft : function() {
+        var page = tabEditors.getPage();
+        var pages = tabEditors.getPages();
+    
+        var currIdx = pages.indexOf(page);
+        var ignore = {};
+            
+        for (var j = pages.length - 1; j >= currIdx; j--) {
+            ignore[j] = page;
+        }
+        
+        this.closeallbutme(ignore);
+    },
+    
     nexttab : function(){
         var n = this.accessed.length - this.$tabAccessCycle++;
         if (n < 0) {