gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-24 04:32:26 +01:00
Code Issues Projects Releases Wiki Activity

Remove inane fourth argument from tabs.remove.

Browse Source
This commit is contained in:
Kris Maglione
2010-10-16 15:55:14 -04:00
parent 2fbd7c93cc
commit 64694a6327
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/content/dactyl.js
View File

@@ -1719,8 +1719,10 @@ const Dactyl = Module("dactyl", {
commands.add(["q[uit]"], commands.add(["q[uit]"],
dactyl.has("tabs") ? "Quit current tab" : "Quit application", dactyl.has("tabs") ? "Quit current tab" : "Quit application",
function (args) { function (args) {
if (dactyl.has("tabs")) if (dactyl.has("tabs") && tabs.remove(config.browser.mCurrentTab, 1, false))
tabs.remove(config.browser.mCurrentTab, 1, false, 1); return;
else if (dactyl.windows.length > 1)
window.close();
else else
dactyl.quit(false, args.bang); dactyl.quit(false, args.bang);
}, { }, {

23
common/content/tabs.js
View File

@@ -293,22 +293,10 @@ const Tabs = Module("tabs", {
* @param {Object} tab The tab to remove. * @param {Object} tab The tab to remove.
* @param {number} count How many tabs to remove. * @param {number} count How many tabs to remove.
* @param {boolean} focusLeftTab Focus the tab to the left of the removed tab. * @param {boolean} focusLeftTab Focus the tab to the left of the removed tab.
* @param {number} quitOnLastTab Whether to quit if the tab being
* deleted is the only tab in the tab list:
* 1 - quit without saving session
* 2 - quit and save session
*/ */
// FIXME: what is quitOnLastTab {1,2} all about then, eh? --djk remove: function (tab, count, focusLeftTab) {
remove: function (tab, count, focusLeftTab, quitOnLastTab) {
count = count || 1; count = count || 1;
let res = this.count > count;
if (quitOnLastTab >= 1 && this.count <= count) {
if (dactyl.windows.length > 1)
window.close();
else
dactyl.quit(quitOnLastTab == 2);
return;
}
let tabs = this.visibleTabs; let tabs = this.visibleTabs;
if (tabs.indexOf(tab) < 0) if (tabs.indexOf(tab) < 0)
@@ -327,6 +315,7 @@ const Tabs = Module("tabs", {
tabs.slice(Math.max(0, index + 1 - count), index + 1).forEach(config.removeTab); tabs.slice(Math.max(0, index + 1 - count), index + 1).forEach(config.removeTab);
else else
tabs.slice(index, index + count).forEach(config.removeTab); tabs.slice(index, index + count).forEach(config.removeTab);
return res;
}, },
/** /**
@@ -557,7 +546,7 @@ const Tabs = Module("tabs", {
dactyl.echoerr("E94: No matching tab for " + arg); dactyl.echoerr("E94: No matching tab for " + arg);
} }
else // just remove the current tab else // just remove the current tab
tabs.remove(tabs.getTab(), Math.max(count, 1), special, 0); tabs.remove(tabs.getTab(), Math.max(count, 1), special);
}, { }, {
argCount: "?", argCount: "?",
bang: true, bang: true,
@@ -945,12 +934,12 @@ const Tabs = Module("tabs", {
mappings.add([modes.NORMAL], ["d"], mappings.add([modes.NORMAL], ["d"],
"Delete current buffer", "Delete current buffer",
function (count) { tabs.remove(tabs.getTab(), count, false, 0); }, function (count) { tabs.remove(tabs.getTab(), count, false); },
{ count: true }); { count: true });
mappings.add([modes.NORMAL], ["D"], mappings.add([modes.NORMAL], ["D"],
"Delete current buffer, focus tab to the left", "Delete current buffer, focus tab to the left",
function (count) { tabs.remove(tabs.getTab(), count, true, 0); }, function (count) { tabs.remove(tabs.getTab(), count, true); },
{ count: true }); { count: true });
mappings.add([modes.NORMAL], ["gb"], mappings.add([modes.NORMAL], ["gb"],