Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

Cleanup tabs #5181

Merged
bomsy merged 6 commits into from
Jan 25, 2018
Merged

Cleanup tabs #5181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd5dc54
add the tabs reducer
bomsy Sep 28, 2017
b26bc18
add space
bomsy Sep 28, 2017
fc87eb6
move part of the tab menuitems to the utils
bomsy Jan 24, 2018
6d5bc25
remove abs reducers
bomsy Jan 24, 2018
f09c200
fixes
bomsy Jan 25, 2018
183a40e
make a function as LION does not exist in the scope of the util
bomsy Jan 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 41 additions & 88 deletions src/components/Editor/Tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import actions from "../../actions";

import { getFilename, getFileURL, isPretty } from "../../utils/source";
import { copyToTheClipboard } from "../../utils/clipboard";
import { getSourceAnnotation } from "../../utils/tabs";
import { getSourceAnnotation, getTabMenuItems } from "../../utils/tabs";

import {
getSelectedSource,
Expand Down Expand Up @@ -60,26 +60,6 @@ class Tab extends PureComponent<Props> {
togglePrettyPrint
} = this.props;

const closeTabLabel = L10N.getStr("sourceTabs.closeTab");
const closeOtherTabsLabel = L10N.getStr("sourceTabs.closeOtherTabs");
const closeTabsToEndLabel = L10N.getStr("sourceTabs.closeTabsToEnd");
const closeAllTabsLabel = L10N.getStr("sourceTabs.closeAllTabs");
const revealInTreeLabel = L10N.getStr("sourceTabs.revealInTree");
const copyLinkLabel = L10N.getStr("copySourceUri2");
const prettyPrintLabel = L10N.getStr("sourceTabs.prettyPrint");

const closeTabKey = L10N.getStr("sourceTabs.closeTab.accesskey");
const closeOtherTabsKey = L10N.getStr(
"sourceTabs.closeOtherTabs.accesskey"
);
const closeTabsToEndKey = L10N.getStr(
"sourceTabs.closeTabsToEnd.accesskey"
);
const closeAllTabsKey = L10N.getStr("sourceTabs.closeAllTabs.accesskey");
const revealInTreeKey = L10N.getStr("sourceTabs.revealInTree.accesskey");
const copyLinkKey = L10N.getStr("copySourceUri2.accesskey");
const prettyPrintKey = L10N.getStr("sourceTabs.prettyPrint.accesskey");

const otherTabs = tabSources.filter(t => t.get("id") !== tab);
const sourceTab = tabSources.find(t => t.get("id") == tab);
const tabURLs = tabSources.map(t => t.get("url"));
Expand All @@ -90,82 +70,55 @@ class Tab extends PureComponent<Props> {
}

const isPrettySource = isPretty(sourceTab);

const closeTabMenuItem = {
id: "node-menu-close-tab",
label: closeTabLabel,
accesskey: closeTabKey,
disabled: false,
click: () => closeTab(sourceTab.get("url"))
};

const closeOtherTabsMenuItem = {
id: "node-menu-close-other-tabs",
label: closeOtherTabsLabel,
accesskey: closeOtherTabsKey,
disabled: false,
click: () => closeTabs(otherTabURLs)
};

const closeTabsToEndMenuItem = {
id: "node-menu-close-tabs-to-end",
label: closeTabsToEndLabel,
accesskey: closeTabsToEndKey,
disabled: false,
click: () => {
const tabIndex = tabSources.findIndex(t => t == tab);
closeTabs(tabURLs.filter((t, i) => i > tabIndex));
}
};

const closeAllTabsMenuItem = {
id: "node-menu-close-all-tabs",
label: closeAllTabsLabel,
accesskey: closeAllTabsKey,
disabled: false,
click: () => closeTabs(tabURLs)
};

const showSourceMenuItem = {
id: "node-menu-show-source",
label: revealInTreeLabel,
accesskey: revealInTreeKey,
disabled: false,
click: () => showSource(sourceTab)
};

const copySourceUri2 = {
id: "node-menu-copy-source-url",
label: copyLinkLabel,
accesskey: copyLinkKey,
disabled: false,
click: () => copyToTheClipboard(sourceTab.get("url"))
};

const prettyPrint = {
id: "node-menu-pretty-print",
label: prettyPrintLabel,
accesskey: prettyPrintKey,
disabled: false,
click: () => togglePrettyPrint(sourceTab.get("id"))
};

const tabMenuItems = getTabMenuItems();
const items = [
{ item: closeTabMenuItem },
{ item: closeOtherTabsMenuItem, hidden: () => tabSources.size === 1 },
{
item: closeTabsToEndMenuItem,
item: {
...tabMenuItems.closeTab,
click: () => closeTab(sourceTab.get("url"))
}
},
{
item: {
...tabMenuItems.closeOtherTabs,
click: () => closeTabs(otherTabURLs)
},
hidden: () => tabSources.size === 1
},
{
item: {
...tabMenuItems.closeTabsToEnd,
click: () => {
const tabIndex = tabSources.findIndex(t => t.get("id") == tab);
closeTabs(tabURLs.filter((t, i) => i > tabIndex));
}
},
hidden: () =>
tabSources.some((t, i) => t === tab && tabSources.size - 1 === i)
},
{ item: closeAllTabsMenuItem },
{
item: { ...tabMenuItems.closeAllTabs, click: () => closeTabs(tabURLs) }
},
{ item: { type: "separator" } },
{ item: copySourceUri2 }
{
item: {
...tabMenuItems.copySourceUri2,
click: () => copyToTheClipboard(sourceTab.get("url"))
}
}
];

if (!isPrettySource) {
items.push({ item: showSourceMenuItem });
items.push({ item: prettyPrint });
items.push({
item: { ...tabMenuItems.showSource, click: () => showSource(tab) }
});

items.push({
item: {
...tabMenuItems.prettyPrint,
click: () => togglePrettyPrint(tab)
}
});
}

showMenu(e, buildMenu(items));
Expand Down
47 changes: 47 additions & 0 deletions src/utils/tabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,50 @@ export function getSourceAnnotation(
return <img className="blackBox" />;
}
}

export function getTabMenuItems() {
return {
closeTab: {
id: "node-menu-close-tab",
label: L10N.getStr("sourceTabs.closeTab"),
accesskey: L10N.getStr("sourceTabs.closeTab.accesskey"),
disabled: false
},
closeOtherTabs: {
id: "node-menu-close-other-tabs",
label: L10N.getStr("sourceTabs.closeOtherTabs"),
accesskey: L10N.getStr("sourceTabs.closeOtherTabs.accesskey"),
disabled: false
},
closeTabsToEnd: {
id: "node-menu-close-tabs-to-end",
label: L10N.getStr("sourceTabs.closeTabsToEnd"),
accesskey: L10N.getStr("sourceTabs.closeTabsToEnd.accesskey"),
disabled: false
},
closeAllTabs: {
id: "node-menu-close-all-tabs",
label: L10N.getStr("sourceTabs.closeAllTabs"),
accesskey: L10N.getStr("sourceTabs.closeAllTabs.accesskey"),
disabled: false
},
showSource: {
id: "node-menu-show-source",
label: L10N.getStr("sourceTabs.revealInTree"),
accesskey: L10N.getStr("sourceTabs.revealInTree.accesskey"),
disabled: false
},
copySourceUri2: {
id: "node-menu-copy-source-url",
label: L10N.getStr("copySourceUri2"),
accesskey: L10N.getStr("copySourceUri2.accesskey"),
disabled: false
},
prettyPrint: {
id: "node-menu-pretty-print",
label: L10N.getStr("sourceTabs.prettyPrint"),
accesskey: L10N.getStr("sourceTabs.prettyPrint.accesskey"),
disabled: false
}
};
}