mirror of
https://github.com/zen-browser/components.git
synced 2025-07-07 22:19:58 +02:00
Fixing macOS keybind issues
This commit is contained in:
HarryHeres
parent
6ab00d24f8
commit
4955c19c25
1 changed files with 347 additions and 159 deletions
|
|
@ -3,174 +3,349 @@ const kZKSActions = {
|
|||
// otherwise "oncommand=" will be added.
|
||||
|
||||
// Split view actions
|
||||
zenSplitViewGrid: ["gZenViewSplitter.toggleShortcut('grid')", 'zen-split-view-grid', 'split-view-action'],
|
||||
zenSplitViewVertical: ["gZenViewSplitter.toggleShortcut('vsep')", 'zen-split-view-vertical', 'split-view-action'],
|
||||
zenSplitViewHorizontal: ["gZenViewSplitter.toggleShortcut('hsep')", 'zen-split-view-horizontal', 'split-view-action'],
|
||||
zenSplitViewClose: ["gZenViewSplitter.toggleShortcut('unsplit')", 'zen-split-view-close', 'split-view-action'],
|
||||
zenSplitViewGrid: [
|
||||
"gZenViewSplitter.toggleShortcut('grid')",
|
||||
"zen-split-view-grid",
|
||||
"split-view-action",
|
||||
],
|
||||
zenSplitViewVertical: [
|
||||
"gZenViewSplitter.toggleShortcut('vsep')",
|
||||
"zen-split-view-vertical",
|
||||
"split-view-action",
|
||||
],
|
||||
zenSplitViewHorizontal: [
|
||||
"gZenViewSplitter.toggleShortcut('hsep')",
|
||||
"zen-split-view-horizontal",
|
||||
"split-view-action",
|
||||
],
|
||||
zenSplitViewClose: [
|
||||
"gZenViewSplitter.toggleShortcut('unsplit')",
|
||||
"zen-split-view-close",
|
||||
"split-view-action",
|
||||
],
|
||||
|
||||
// Workspace actions
|
||||
zenChangeWorkspace: ['ZenWorkspaces.changeWorkspaceShortcut()', 'zen-change-workspace', 'workspace-action'],
|
||||
zenChangeWorkspace: [
|
||||
"ZenWorkspaces.changeWorkspaceShortcut()",
|
||||
"zen-change-workspace",
|
||||
"workspace-action",
|
||||
],
|
||||
|
||||
// manage actions
|
||||
openNewTab: ['command:cmd_newNavigatorTabNoEvent', 'open-new-tab', 'tab-action'],
|
||||
duplicateTab: ["duplicateTabIn(gBrowser.selectedTab, 'tab')", 'duplicate-tab', 'tab-action'],
|
||||
closeTab: ['command:cmd_close', 'close-tab', 'tab-action'],
|
||||
openNewWindow: ['command:cmd_newNavigator', 'open-new-window', 'tab-action'],
|
||||
openNewPrivateWindow: ['command:Tools:PrivateBrowsing', 'open-new-private-window', 'tab-action'],
|
||||
closeWindow: ['command:cmd_closeWindow', 'close-window', 'tab-action'],
|
||||
restoreLastTab: ['undoCloseTab()', 'restore-last-session', 'tab-action'],
|
||||
restoreLastWindow: ['command:History:UndoCloseWindow', 'restore-last-window', 'tab-action'],
|
||||
showNextTab: ['gBrowser.tabContainer.advanceSelectedTab(1, true)', 'show-next-tab', 'tab-action'],
|
||||
showPreviousTab: ['gBrowser.tabContainer.advanceSelectedTab(-1, true)', 'show-previous-tab', 'tab-action'],
|
||||
showAllTabsPanel: ['gTabsPanel.showAllTabsPanel()', 'show-all-tabs-panel', 'tab-action'],
|
||||
openNewTab: [
|
||||
"command:cmd_newNavigatorTabNoEvent",
|
||||
"open-new-tab",
|
||||
"tab-action",
|
||||
],
|
||||
duplicateTab: [
|
||||
"duplicateTabIn(gBrowser.selectedTab, 'tab')",
|
||||
"duplicate-tab",
|
||||
"tab-action",
|
||||
],
|
||||
closeTab: ["command:cmd_close", "close-tab", "tab-action"],
|
||||
openNewWindow: ["command:cmd_newNavigator", "open-new-window", "tab-action"],
|
||||
openNewPrivateWindow: [
|
||||
"command:Tools:PrivateBrowsing",
|
||||
"open-new-private-window",
|
||||
"tab-action",
|
||||
],
|
||||
closeWindow: ["command:cmd_closeWindow", "close-window", "tab-action"],
|
||||
restoreLastTab: ["undoCloseTab()", "restore-last-session", "tab-action"],
|
||||
restoreLastWindow: [
|
||||
"command:History:UndoCloseWindow",
|
||||
"restore-last-window",
|
||||
"tab-action",
|
||||
],
|
||||
showNextTab: [
|
||||
"gBrowser.tabContainer.advanceSelectedTab(1, true)",
|
||||
"show-next-tab",
|
||||
"tab-action",
|
||||
],
|
||||
showPreviousTab: [
|
||||
"gBrowser.tabContainer.advanceSelectedTab(-1, true)",
|
||||
"show-previous-tab",
|
||||
"tab-action",
|
||||
],
|
||||
showAllTabsPanel: [
|
||||
"gTabsPanel.showAllTabsPanel()",
|
||||
"show-all-tabs-panel",
|
||||
"tab-action",
|
||||
],
|
||||
|
||||
// Compact mode actions
|
||||
zenToggleCompactMode: ['gZenCompactModeManager.toggle()', 'zen-toggle-compact-mode', 'compact-mode-action'],
|
||||
zenToggleCompactMode: [
|
||||
"gZenCompactModeManager.toggle()",
|
||||
"zen-toggle-compact-mode",
|
||||
"compact-mode-action",
|
||||
],
|
||||
zenToggleCompactModeSidebar: [
|
||||
'gZenCompactModeManager.toggleSidebar()',
|
||||
'zen-toggle-compact-mode-sidebar',
|
||||
'compact-mode-action',
|
||||
"gZenCompactModeManager.toggleSidebar()",
|
||||
"zen-toggle-compact-mode-sidebar",
|
||||
"compact-mode-action",
|
||||
],
|
||||
zenToggleCompactModeToolbar: [
|
||||
'gZenCompactModeManager.toggleToolbar()',
|
||||
'zen-toggle-compact-mode-toolbar',
|
||||
'compact-mode-action',
|
||||
"gZenCompactModeManager.toggleToolbar()",
|
||||
"zen-toggle-compact-mode-toolbar",
|
||||
"compact-mode-action",
|
||||
],
|
||||
|
||||
// Page actions
|
||||
sendWithMail: ['command:Browser:SendLink', 'send-with-mail', 'page-action'],
|
||||
savePage: ['command:Browser:SavePage', 'save-page', 'page-action'],
|
||||
printPage: ['command:cmd_print', 'print-page', 'page-action'],
|
||||
muteCurrentTab: ['command:cmd_toggleMute', 'mute-current-tab', 'page-action'],
|
||||
showSourceOfPage: ['command:View:PageSource', 'show-source-of-page', 'page-action'],
|
||||
showPageInfo: ['command:View:PageInfo', 'show-page-info', 'page-action'],
|
||||
sendWithMail: ["command:Browser:SendLink", "send-with-mail", "page-action"],
|
||||
savePage: ["command:Browser:SavePage", "save-page", "page-action"],
|
||||
printPage: ["command:cmd_print", "print-page", "page-action"],
|
||||
muteCurrentTab: ["command:cmd_toggleMute", "mute-current-tab", "page-action"],
|
||||
showSourceOfPage: [
|
||||
"command:View:PageSource",
|
||||
"show-source-of-page",
|
||||
"page-action",
|
||||
],
|
||||
showPageInfo: ["command:View:PageInfo", "show-page-info", "page-action"],
|
||||
|
||||
// Visible actions
|
||||
zoomIn: ['command:cmd_fullZoomEnlarge', 'zoom-in', 'visible-action'],
|
||||
zoomOut: ['command:cmd_fullZoomReduce', 'zoom-out', 'visible-action'],
|
||||
resetZoom: ['command:cmd_fullZoomReset', 'reset-zoom', 'visible-action'],
|
||||
zoomIn: ["command:cmd_fullZoomEnlarge", "zoom-in", "visible-action"],
|
||||
zoomOut: ["command:cmd_fullZoomReduce", "zoom-out", "visible-action"],
|
||||
resetZoom: ["command:cmd_fullZoomReset", "reset-zoom", "visible-action"],
|
||||
|
||||
// History actions
|
||||
back: ['command:Browser:Back', 'back', 'history-action'],
|
||||
forward: ['command:Browser:Forward', 'forward', 'history-action'],
|
||||
stop: ['command:Browser:Stop', 'stop', 'history-action'],
|
||||
reload: ['command:Browser:Reload', 'reload', 'history-action'],
|
||||
forceReload: ['command:Browser:ReloadSkipCache', 'force-reload', 'history-action'],
|
||||
back: ["command:Browser:Back", "back", "history-action"],
|
||||
forward: ["command:Browser:Forward", "forward", "history-action"],
|
||||
stop: ["command:Browser:Stop", "stop", "history-action"],
|
||||
reload: ["command:Browser:Reload", "reload", "history-action"],
|
||||
forceReload: [
|
||||
"command:Browser:ReloadSkipCache",
|
||||
"force-reload",
|
||||
"history-action",
|
||||
],
|
||||
|
||||
// search actions
|
||||
searchInThisPage: ["gLazyFindCommand('onFindCommand')", 'search-in-this-page', 'search-action'],
|
||||
showNextSearchResult: ["gLazyFindCommand('onFindAgainCommand', false)", 'show-next-search-result', 'search-action'],
|
||||
showPreviousSearchResult: ["gLazyFindCommand('onFindAgainCommand', true)", 'show-previous-search-result', 'search-action'],
|
||||
searchTheWeb: ['command:Tools:Search', 'search-the-web', 'search-action'],
|
||||
searchInThisPage: [
|
||||
"gLazyFindCommand('onFindCommand')",
|
||||
"search-in-this-page",
|
||||
"search-action",
|
||||
],
|
||||
showNextSearchResult: [
|
||||
"gLazyFindCommand('onFindAgainCommand', false)",
|
||||
"show-next-search-result",
|
||||
"search-action",
|
||||
],
|
||||
showPreviousSearchResult: [
|
||||
"gLazyFindCommand('onFindAgainCommand', true)",
|
||||
"show-previous-search-result",
|
||||
"search-action",
|
||||
],
|
||||
searchTheWeb: ["command:Tools:Search", "search-the-web", "search-action"],
|
||||
|
||||
// Tools actions
|
||||
openMigrationWizard: ['command:cmd_file_importFromAnotherBrowser', 'open-migration-wizard', 'tools-action'],
|
||||
quitFromApplication: ['command:goQuitApplication', 'quit-from-application', 'tools-action'],
|
||||
enterIntoCustomizeMode: ['gCustomizeMode.enter()', 'enter-into-customize-mode', 'tools-action'],
|
||||
enterIntoOfflineMode: ['command:cmd_toggleOfflineStatus', 'enter-into-offline-mode', 'tools-action'],
|
||||
openScreenCapture: ['command:Browser:Screenshot', 'open-screen-capture', 'tools-action'],
|
||||
openMigrationWizard: [
|
||||
"command:cmd_file_importFromAnotherBrowser",
|
||||
"open-migration-wizard",
|
||||
"tools-action",
|
||||
],
|
||||
quitFromApplication: [
|
||||
"command:goQuitApplication",
|
||||
"quit-from-application",
|
||||
"tools-action",
|
||||
],
|
||||
enterIntoCustomizeMode: [
|
||||
"gCustomizeMode.enter()",
|
||||
"enter-into-customize-mode",
|
||||
"tools-action",
|
||||
],
|
||||
enterIntoOfflineMode: [
|
||||
"command:cmd_toggleOfflineStatus",
|
||||
"enter-into-offline-mode",
|
||||
"tools-action",
|
||||
],
|
||||
openScreenCapture: [
|
||||
"command:Browser:Screenshot",
|
||||
"open-screen-capture",
|
||||
"tools-action",
|
||||
],
|
||||
|
||||
// Bookmark actions
|
||||
bookmarkThisPage: [
|
||||
"BrowserPageActions.doCommandForAction(PageActions.actionForID('bookmark'), event, this);",
|
||||
'bookmark-this-page',
|
||||
'bookmark-action',
|
||||
"bookmark-this-page",
|
||||
"bookmark-action",
|
||||
],
|
||||
openBookmarkAddTool: [
|
||||
'PlacesUIUtils.showBookmarkPagesDialog(PlacesCommandHook.uniqueCurrentPages)',
|
||||
'open-bookmark-add-tool',
|
||||
'bookmark-action',
|
||||
"PlacesUIUtils.showBookmarkPagesDialog(PlacesCommandHook.uniqueCurrentPages)",
|
||||
"open-bookmark-add-tool",
|
||||
"bookmark-action",
|
||||
],
|
||||
openBookmarksManager: [
|
||||
"SidebarController.toggle('viewBookmarksSidebar');",
|
||||
"open-bookmarks-manager",
|
||||
"bookmark-action",
|
||||
],
|
||||
openBookmarksManager: ["SidebarController.toggle('viewBookmarksSidebar');", 'open-bookmarks-manager', 'bookmark-action'],
|
||||
toggleBookmarkToolbar: [
|
||||
"BookmarkingUI.toggleBookmarksToolbar('bookmark-tools')",
|
||||
'toggle-bookmark-toolbar',
|
||||
'bookmark-action',
|
||||
"toggle-bookmark-toolbar",
|
||||
"bookmark-action",
|
||||
],
|
||||
|
||||
// Open Page actions
|
||||
openGeneralPreferences: ['openPreferences()', 'open-general-preferences', 'open-page-action'],
|
||||
openPrivacyPreferences: ["openPreferences('panePrivacy')", 'open-privacy-preferences', 'open-page-action'],
|
||||
openWorkspacesPreferences: ["openPreferences('paneWorkspaces')", 'open-workspaces-preferences', 'open-page-action'],
|
||||
openContainersPreferences: ["openPreferences('paneContainers')", 'open-containers-preferences', 'open-page-action'],
|
||||
openSearchPreferences: ["openPreferences('paneSearch')", 'open-search-preferences', 'open-page-action'],
|
||||
openSyncPreferences: ["openPreferences('paneSync')", 'open-sync-preferences', 'open-page-action'],
|
||||
openTaskManager: ['command:View:AboutProcesses', 'open-task-manager', 'open-page-action'],
|
||||
openAddonsManager: ['command:Tools:Addons', 'open-addons-manager', 'open-page-action'],
|
||||
openHomePage: ['BrowserHome()', 'open-home-page', 'open-page-action'],
|
||||
openGeneralPreferences: [
|
||||
"openPreferences()",
|
||||
"open-general-preferences",
|
||||
"open-page-action",
|
||||
],
|
||||
openPrivacyPreferences: [
|
||||
"openPreferences('panePrivacy')",
|
||||
"open-privacy-preferences",
|
||||
"open-page-action",
|
||||
],
|
||||
openWorkspacesPreferences: [
|
||||
"openPreferences('paneWorkspaces')",
|
||||
"open-workspaces-preferences",
|
||||
"open-page-action",
|
||||
],
|
||||
openContainersPreferences: [
|
||||
"openPreferences('paneContainers')",
|
||||
"open-containers-preferences",
|
||||
"open-page-action",
|
||||
],
|
||||
openSearchPreferences: [
|
||||
"openPreferences('paneSearch')",
|
||||
"open-search-preferences",
|
||||
"open-page-action",
|
||||
],
|
||||
openSyncPreferences: [
|
||||
"openPreferences('paneSync')",
|
||||
"open-sync-preferences",
|
||||
"open-page-action",
|
||||
],
|
||||
openTaskManager: [
|
||||
"command:View:AboutProcesses",
|
||||
"open-task-manager",
|
||||
"open-page-action",
|
||||
],
|
||||
openAddonsManager: [
|
||||
"command:Tools:Addons",
|
||||
"open-addons-manager",
|
||||
"open-page-action",
|
||||
],
|
||||
openHomePage: ["BrowserHome()", "open-home-page", "open-page-action"],
|
||||
|
||||
// History actions
|
||||
forgetHistory: ['command:Tools:Sanitize', 'forget-history', 'history-action'],
|
||||
quickForgetHistory: ['PlacesUtils.history.clear(true)', 'quick-forget-history', 'history-action'],
|
||||
clearRecentHistory: ['command:cmd_closeWindow', 'clear-recent-history', 'history-action'],
|
||||
restoreLastSession: ['command:Browser:RestoreLastSession', 'restore-last-session', 'history-action'],
|
||||
searchHistory: ['command:History:SearchHistory', 'search-history', 'history-action'],
|
||||
manageHistory: ["PlacesCommandHook.showPlacesOrganizer('History')", 'manage-history', 'history-action'],
|
||||
forgetHistory: ["command:Tools:Sanitize", "forget-history", "history-action"],
|
||||
quickForgetHistory: [
|
||||
"PlacesUtils.history.clear(true)",
|
||||
"quick-forget-history",
|
||||
"history-action",
|
||||
],
|
||||
clearRecentHistory: [
|
||||
"command:cmd_closeWindow",
|
||||
"clear-recent-history",
|
||||
"history-action",
|
||||
],
|
||||
restoreLastSession: [
|
||||
"command:Browser:RestoreLastSession",
|
||||
"restore-last-session",
|
||||
"history-action",
|
||||
],
|
||||
searchHistory: [
|
||||
"command:History:SearchHistory",
|
||||
"search-history",
|
||||
"history-action",
|
||||
],
|
||||
manageHistory: [
|
||||
"PlacesCommandHook.showPlacesOrganizer('History')",
|
||||
"manage-history",
|
||||
"history-action",
|
||||
],
|
||||
|
||||
// Downloads actions
|
||||
openDownloads: ['DownloadsPanel.showDownloadsHistory()', 'open-downloads', 'downloads-action'],
|
||||
openDownloads: [
|
||||
"DownloadsPanel.showDownloadsHistory()",
|
||||
"open-downloads",
|
||||
"downloads-action",
|
||||
],
|
||||
|
||||
// Sidebar actions
|
||||
showBookmarkSidebar: ["SidebarController.show('viewBookmarksSidebar')", 'show-bookmark-sidebar', 'sidebar-action'],
|
||||
showHistorySidebar: ["SidebarController.show('viewHistorySidebar')", 'show-history-sidebar', 'sidebar-action'],
|
||||
showSyncedTabsSidebar: ["SidebarController.show('viewTabsSidebar')", 'show-synced-tabs-sidebar', 'sidebar-action'],
|
||||
reverseSidebarPosition: ['SidebarController.reversePosition()', 'reverse-sidebar', 'sidebar-action'],
|
||||
hideSidebar: ['SidebarController.hide()', 'hide-sidebar', 'sidebar-action'],
|
||||
toggleSidebar: ['SidebarController.toggle()', 'toggle-sidebar', 'sidebar-action'],
|
||||
zenToggleWebPanels: ['gZenBrowserManagerSidebar.toggle()', 'zen-toggle-web-panels', 'sidebar-action'],
|
||||
zenExpandSidebar: ['gZenVerticalTabsManager.toggleExpand()', 'zen-expand-sidebar', 'sidebar-action'],
|
||||
showBookmarkSidebar: [
|
||||
"SidebarController.show('viewBookmarksSidebar')",
|
||||
"show-bookmark-sidebar",
|
||||
"sidebar-action",
|
||||
],
|
||||
showHistorySidebar: [
|
||||
"SidebarController.show('viewHistorySidebar')",
|
||||
"show-history-sidebar",
|
||||
"sidebar-action",
|
||||
],
|
||||
showSyncedTabsSidebar: [
|
||||
"SidebarController.show('viewTabsSidebar')",
|
||||
"show-synced-tabs-sidebar",
|
||||
"sidebar-action",
|
||||
],
|
||||
reverseSidebarPosition: [
|
||||
"SidebarController.reversePosition()",
|
||||
"reverse-sidebar",
|
||||
"sidebar-action",
|
||||
],
|
||||
hideSidebar: ["SidebarController.hide()", "hide-sidebar", "sidebar-action"],
|
||||
toggleSidebar: [
|
||||
"SidebarController.toggle()",
|
||||
"toggle-sidebar",
|
||||
"sidebar-action",
|
||||
],
|
||||
zenToggleWebPanels: [
|
||||
"gZenBrowserManagerSidebar.toggle()",
|
||||
"zen-toggle-web-panels",
|
||||
"sidebar-action",
|
||||
],
|
||||
};
|
||||
|
||||
const kZenDefaultShortcuts = {
|
||||
// Split view actions
|
||||
zenSplitViewGrid: 'Ctrl+Alt+G',
|
||||
zenSplitViewVertical: 'Ctrl+Alt+V',
|
||||
zenSplitViewHorizontal: 'Ctrl+Alt+H',
|
||||
zenSplitViewClose: 'Ctrl+Alt+U',
|
||||
zenSplitViewGrid: "Ctrl+Alt+G",
|
||||
zenSplitViewVertical: "Ctrl+Alt+V",
|
||||
zenSplitViewHorizontal: "Ctrl+Alt+H",
|
||||
zenSplitViewClose: "Ctrl+Alt+U",
|
||||
|
||||
// Workspace actions
|
||||
zenChangeWorkspace: 'Ctrl+Shift+E',
|
||||
zenChangeWorkspace: "Ctrl+Shift+E",
|
||||
|
||||
// Compact mode actions
|
||||
zenToggleCompactMode: 'Ctrl+Alt+C',
|
||||
zenToggleCompactModeSidebar: 'Ctrl+Alt+S',
|
||||
zenToggleCompactModeToolbar: 'Ctrl+Alt+T',
|
||||
zenToggleCompactMode: "Ctrl+Alt+C",
|
||||
zenToggleCompactModeSidebar: "Ctrl+Alt+S",
|
||||
zenToggleCompactModeToolbar: "Ctrl+Alt+T",
|
||||
|
||||
// manage actions
|
||||
zenToggleWebPanels: 'Alt+P',
|
||||
zenToggleWebPanels: "Alt+P",
|
||||
};
|
||||
|
||||
// Section: ZenKeyboardShortcuts
|
||||
|
||||
const kZKSStorageKey = 'zen.keyboard.shortcuts';
|
||||
const kZKSStorageKey = "zen.keyboard.shortcuts";
|
||||
const kZKSKeyCodeMap = {
|
||||
F1: 'VK_F1',
|
||||
F2: 'VK_F2',
|
||||
F3: 'VK_F3',
|
||||
F4: 'VK_F4',
|
||||
F5: 'VK_F5',
|
||||
F6: 'VK_F6',
|
||||
F7: 'VK_F7',
|
||||
F8: 'VK_F8',
|
||||
F9: 'VK_F9',
|
||||
F10: 'VK_F10',
|
||||
F11: 'VK_F11',
|
||||
F12: 'VK_F12',
|
||||
TAB: 'VK_TAB',
|
||||
ENTER: 'VK_RETURN',
|
||||
ESCAPE: 'VK_ESCAPE',
|
||||
SPACE: 'VK_SPACE',
|
||||
ARROWLEFT: 'VK_LEFT',
|
||||
ARROWRIGHT: 'VK_RIGHT',
|
||||
ARROWUP: 'VK_UP',
|
||||
ARROWDOWN: 'VK_DOWN',
|
||||
DELETE: 'VK_DELETE',
|
||||
BACKSPACE: 'VK_BACK',
|
||||
F1: "VK_F1",
|
||||
F2: "VK_F2",
|
||||
F3: "VK_F3",
|
||||
F4: "VK_F4",
|
||||
F5: "VK_F5",
|
||||
F6: "VK_F6",
|
||||
F7: "VK_F7",
|
||||
F8: "VK_F8",
|
||||
F9: "VK_F9",
|
||||
F10: "VK_F10",
|
||||
F11: "VK_F11",
|
||||
F12: "VK_F12",
|
||||
TAB: "VK_TAB",
|
||||
ENTER: "VK_RETURN",
|
||||
ESCAPE: "VK_ESCAPE",
|
||||
SPACE: "VK_SPACE",
|
||||
ARROWLEFT: "VK_LEFT",
|
||||
ARROWRIGHT: "VK_RIGHT",
|
||||
ARROWUP: "VK_UP",
|
||||
ARROWDOWN: "VK_DOWN",
|
||||
DELETE: "VK_DELETE",
|
||||
BACKSPACE: "VK_BACK",
|
||||
};
|
||||
|
||||
var gZenKeyboardShortcuts = {
|
||||
init() {
|
||||
if (!Services.prefs.getBoolPref('zen.keyboard.shortcuts.enabled')) {
|
||||
if (!Services.prefs.getBoolPref("zen.keyboard.shortcuts.enabled")) {
|
||||
return;
|
||||
}
|
||||
this._initShortcuts();
|
||||
|
|
@ -186,7 +361,7 @@ var gZenKeyboardShortcuts = {
|
|||
}
|
||||
this.__savedShortcuts = JSON.parse(data);
|
||||
} catch (e) {
|
||||
console.error('Zen CKS: Error parsing saved shortcuts', e);
|
||||
console.error("Zen CKS: Error parsing saved shortcuts", e);
|
||||
this.__savedShortcuts = {};
|
||||
}
|
||||
}
|
||||
|
|
@ -207,16 +382,37 @@ var gZenKeyboardShortcuts = {
|
|||
},
|
||||
|
||||
_parseDefaultShortcut(shortcut) {
|
||||
let ctrl = shortcut.includes('Ctrl+');
|
||||
let alt = shortcut.includes('Alt+');
|
||||
let shift = shortcut.includes('Shift+');
|
||||
let meta = shortcut.includes('Meta+');
|
||||
let key = shortcut.replace(/Ctrl\+|Alt\+|Shift\+|Meta\+/g, '');
|
||||
if (['Tab', 'Enter', 'Escape', 'Space', 'ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'].includes(key)) {
|
||||
let ctrl = shortcut.includes("Ctrl+");
|
||||
let alt = shortcut.includes("Alt+") || shortcut.includes("Option+");
|
||||
let shift = shortcut.includes("Shift+");
|
||||
let meta = shortcut.includes("Meta+") || shortcut.includes("Cmd+");
|
||||
let key = shortcut.replace(
|
||||
/Ctrl\+|Alt\+|Option\+|Shift\+|Meta\+|Cmd\+/g,
|
||||
"",
|
||||
);
|
||||
if (
|
||||
[
|
||||
"Tab",
|
||||
"Enter",
|
||||
"Escape",
|
||||
"Space",
|
||||
"ArrowLeft",
|
||||
"ArrowRight",
|
||||
"ArrowUp",
|
||||
"ArrowDown",
|
||||
].includes(key)
|
||||
) {
|
||||
return { ctrl, alt, shift, meta, key: undefined, keycode: key };
|
||||
}
|
||||
let isKeyCode = key.length > 1;
|
||||
return { ctrl, alt, shift, meta, key: isKeyCode ? undefined : key, keycode: isKeyCode ? key : undefined };
|
||||
return {
|
||||
ctrl,
|
||||
alt,
|
||||
shift,
|
||||
meta,
|
||||
key: isKeyCode ? undefined : key,
|
||||
keycode: isKeyCode ? key : undefined,
|
||||
};
|
||||
},
|
||||
|
||||
_addDefaultShortcuts() {
|
||||
|
|
@ -239,42 +435,50 @@ var gZenKeyboardShortcuts = {
|
|||
},
|
||||
|
||||
_initShortcuts() {
|
||||
if (window.location.href == 'chrome://browser/content/browser.xhtml') {
|
||||
console.info('Zen CKS: Initializing shortcuts');
|
||||
Services.prefs.addObserver(kZKSStorageKey, this._onShortcutChange.bind(this));
|
||||
Services.prefs.addObserver('zen.keyboard.shortcuts.disable-firefox', this._disableFirefoxShortcuts.bind(this));
|
||||
if (window.location.href == "chrome://browser/content/browser.xhtml") {
|
||||
console.info("Zen CKS: Initializing shortcuts");
|
||||
Services.prefs.addObserver(
|
||||
kZKSStorageKey,
|
||||
this._onShortcutChange.bind(this),
|
||||
);
|
||||
Services.prefs.addObserver(
|
||||
"zen.keyboard.shortcuts.disable-firefox",
|
||||
this._disableFirefoxShortcuts.bind(this),
|
||||
);
|
||||
this._initSavedShortcuts();
|
||||
this._disableFirefoxShortcuts();
|
||||
}
|
||||
},
|
||||
|
||||
_disableFirefoxShortcuts() {
|
||||
let disable = Services.prefs.getBoolPref('zen.keyboard.shortcuts.disable-firefox');
|
||||
let disable = Services.prefs.getBoolPref(
|
||||
"zen.keyboard.shortcuts.disable-firefox",
|
||||
);
|
||||
if (!disable) {
|
||||
return;
|
||||
}
|
||||
window.SessionStore.promiseInitialized.then(() => {
|
||||
let keySet = document.getElementById('mainKeyset');
|
||||
let keySet = document.getElementById("mainKeyset");
|
||||
if (!keySet) {
|
||||
throw new Error('Zen CKS: No main keyset found');
|
||||
throw new Error("Zen CKS: No main keyset found");
|
||||
}
|
||||
for (let child of keySet.children) {
|
||||
if (!child.id.startsWith('zen-key_')) {
|
||||
child.setAttribute('disabled', true);
|
||||
if (!child.id.startsWith("zen-key_")) {
|
||||
child.setAttribute("disabled", true);
|
||||
}
|
||||
}
|
||||
console.info('Remove already exist shortcut keys');
|
||||
console.info("Remove already exist shortcut keys");
|
||||
});
|
||||
},
|
||||
|
||||
_onShortcutChange() {
|
||||
console.info('Zen CKS: Shortcut changed');
|
||||
console.info("Zen CKS: Shortcut changed");
|
||||
this.__savedShortcuts = null;
|
||||
this._initSavedShortcuts(true);
|
||||
},
|
||||
|
||||
_getCommandAttribute(action) {
|
||||
if (action.startsWith('command:')) {
|
||||
if (action.startsWith("command:")) {
|
||||
return `command="${action.substring(8)}"`;
|
||||
}
|
||||
return `oncommand="${action}"`;
|
||||
|
|
@ -287,8 +491,7 @@ var gZenKeyboardShortcuts = {
|
|||
}
|
||||
|
||||
const action = kZKSActions[_action][0];
|
||||
const keycode = shortcut.keycode?.toUpperCase();
|
||||
const key = shortcut.key?.toUpperCase();
|
||||
const key = shortcut.key.toUpperCase();
|
||||
let modifiers = {
|
||||
accel: shortcut.ctrl,
|
||||
alt: shortcut.alt,
|
||||
|
|
@ -298,19 +501,7 @@ var gZenKeyboardShortcuts = {
|
|||
|
||||
modifiers = Object.keys(modifiers)
|
||||
.filter((mod) => modifiers[mod])
|
||||
.join(',');
|
||||
|
||||
if (keycode) {
|
||||
const key = kZKSKeyCodeMap[keycode] || keycode;
|
||||
return window.MozXULElement.parseXULToFragment(`
|
||||
<key
|
||||
id="zen-key_${_action}"
|
||||
class="zen-keyboard-shortcut"
|
||||
keycode="${key}"
|
||||
${this._getCommandAttribute(action)}
|
||||
modifiers="${modifiers}"/>
|
||||
`);
|
||||
}
|
||||
.join(",");
|
||||
|
||||
return window.MozXULElement.parseXULToFragment(`
|
||||
<key
|
||||
|
|
@ -323,9 +514,9 @@ var gZenKeyboardShortcuts = {
|
|||
},
|
||||
|
||||
_initSavedShortcuts(fromUpdate = false) {
|
||||
let keySet = document.getElementById('mainKeyset');
|
||||
let keySet = document.getElementById("mainKeyset");
|
||||
if (!keySet) {
|
||||
throw new Error('Zen CKS: No main keyset found');
|
||||
throw new Error("Zen CKS: No main keyset found");
|
||||
}
|
||||
|
||||
for (let action in kZKSActions) {
|
||||
|
|
@ -340,13 +531,13 @@ var gZenKeyboardShortcuts = {
|
|||
}
|
||||
}
|
||||
|
||||
this._fixMeinKeyset();
|
||||
this._fixMainKeyset();
|
||||
},
|
||||
|
||||
_fixMeinKeyset() {
|
||||
let keySet = document.getElementById('mainKeyset');
|
||||
_fixMainKeyset() {
|
||||
let keySet = document.getElementById("mainKeyset");
|
||||
if (!keySet) {
|
||||
throw new Error('Zen CKS: No main keyset found');
|
||||
throw new Error("Zen CKS: No main keyset found");
|
||||
}
|
||||
const parent = keySet.parentElement;
|
||||
// We need to re-append the main keyset to the document to make the shortcuts work
|
||||
|
|
@ -363,23 +554,20 @@ var gZenKeyboardShortcuts = {
|
|||
},
|
||||
|
||||
shortCutToString(shortcut) {
|
||||
let str = '';
|
||||
let str = "";
|
||||
if (shortcut.ctrl) {
|
||||
str += "Ctrl+";
|
||||
}
|
||||
if (shortcut.alt) {
|
||||
str += 'Alt+';
|
||||
str += AppConstants.platform == "macosx" ? "Option+" : "Alt+";
|
||||
}
|
||||
if (shortcut.shift) {
|
||||
str += 'Shift+';
|
||||
str += "Shift+";
|
||||
}
|
||||
if (shortcut.meta) {
|
||||
str += AppConstants.platform == "macosx" ? "Cmd+" : "Meta+";
|
||||
}
|
||||
if (shortcut.keycode) {
|
||||
str += shortcut.keycode;
|
||||
} else if (shortcut.key) {
|
||||
// It can be undefined if edited from the settings
|
||||
if (shortcut.key) {
|
||||
str += shortcut.key;
|
||||
}
|
||||
return str;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue