mirror of
https://github.com/zen-browser/components.git
synced 2025-07-08 20:19:59 +02:00
refactor: Remove unnecessary console.log statement in ZenThemeBuilder
This commit is contained in:
parent
0e9849bab8
commit
f349477728
2 changed files with 74 additions and 44 deletions
|
@ -1,7 +1,7 @@
|
||||||
|
|
||||||
const kZKSActions = {
|
const kZKSActions = {
|
||||||
// manage actions
|
// manage actions
|
||||||
openNewTab: ["BrowserOpenTab()","open-new-tab", "tab-action"],
|
openNewTab: ["console.log('hellooooo')","open-new-tab", "tab-action"],
|
||||||
closeTab: ["BrowserCloseTabOrWindow()", "close-tab", "tab-action"],
|
closeTab: ["BrowserCloseTabOrWindow()", "close-tab", "tab-action"],
|
||||||
openNewWindow: ["OpenBrowserWindow()", "open-new-window", "tab-action"],
|
openNewWindow: ["OpenBrowserWindow()", "open-new-window", "tab-action"],
|
||||||
openNewPrivateWindow: ["OpenBrowserWindow({private: true})", "open-new-private-window", "tab-action"],
|
openNewPrivateWindow: ["OpenBrowserWindow({private: true})", "open-new-private-window", "tab-action"],
|
||||||
|
@ -19,7 +19,6 @@ const kZKSActions = {
|
||||||
muteCurrentTab: ["gBrowser.toggleMuteAudioOnMultiSelectedTabs(gBrowser.selectedTab)", "mute-current-tab", "page-action"],
|
muteCurrentTab: ["gBrowser.toggleMuteAudioOnMultiSelectedTabs(gBrowser.selectedTab)", "mute-current-tab", "page-action"],
|
||||||
showSourceOfPage: ["BrowserViewSource(window.gBrowser.selectedBrowser)", "show-source-of-page", "page-action"],
|
showSourceOfPage: ["BrowserViewSource(window.gBrowser.selectedBrowser)", "show-source-of-page", "page-action"],
|
||||||
showPageInfo: ["BrowserPageInfo()", "show-page-info", "page-action"],
|
showPageInfo: ["BrowserPageInfo()", "show-page-info", "page-action"],
|
||||||
EnableRestMode: ["gFloorpCommands.enableRestMode();", "rest-mode", "page-action"],
|
|
||||||
|
|
||||||
// Visible actions
|
// Visible actions
|
||||||
zoomIn: ["FullZoom.enlarge()", "zoom-in", "visible-action"],
|
zoomIn: ["FullZoom.enlarge()", "zoom-in", "visible-action"],
|
||||||
|
@ -46,9 +45,6 @@ const kZKSActions = {
|
||||||
enterIntoOfflineMode: ["BrowserOffline.toggleOfflineStatus()", "enter-into-offline-mode", "tools-action"],
|
enterIntoOfflineMode: ["BrowserOffline.toggleOfflineStatus()", "enter-into-offline-mode", "tools-action"],
|
||||||
openScreenCapture: ["ScreenshotsUtils.notify(window, 'shortcut')", "open-screen-capture", "tools-action"],
|
openScreenCapture: ["ScreenshotsUtils.notify(window, 'shortcut')", "open-screen-capture", "tools-action"],
|
||||||
|
|
||||||
// PIP actions
|
|
||||||
showPIP: ["gFloorpCSKActionFunctions.PictureInPicture.togglePictureInPicture(event)", "show-pip", "pip-action"],
|
|
||||||
|
|
||||||
// Bookmark actions
|
// Bookmark actions
|
||||||
bookmarkThisPage: ["BrowserPageActions.doCommandForAction(PageActions.actionForID('bookmark'), event, this);", "bookmark-this-page", "bookmark-action"],
|
bookmarkThisPage: ["BrowserPageActions.doCommandForAction(PageActions.actionForID('bookmark'), event, this);", "bookmark-this-page", "bookmark-action"],
|
||||||
openBookmarkAddTool: ["PlacesUIUtils.showBookmarkPagesDialog(PlacesCommandHook.uniqueCurrentPages)", "open-bookmark-add-tool", "bookmark-action"],
|
openBookmarkAddTool: ["PlacesUIUtils.showBookmarkPagesDialog(PlacesCommandHook.uniqueCurrentPages)", "open-bookmark-add-tool", "bookmark-action"],
|
||||||
|
@ -85,29 +81,6 @@ const kZKSActions = {
|
||||||
hideSidebar: ["SidebarUI.hide()", "hide-sidebar", "sidebar-action"],
|
hideSidebar: ["SidebarUI.hide()", "hide-sidebar", "sidebar-action"],
|
||||||
toggleSidebar: ["SidebarUI.toggle()", "toggle-sidebar", "sidebar-action"],
|
toggleSidebar: ["SidebarUI.toggle()", "toggle-sidebar", "sidebar-action"],
|
||||||
|
|
||||||
// Workspaces actions
|
|
||||||
changeWorkspaceToPrevious: ["gWorkspaces.changeWorkspaceToNextOrBeforeWorkspace()", "open-previous-workspace", "workspaces-action"],
|
|
||||||
changeWorkspaceToNext: ["gWorkspaces.changeWorkspaceToNextOrBeforeWorkspace(true)", "open-next-workspace", "workspaces-action"],
|
|
||||||
|
|
||||||
// BMS actions
|
|
||||||
toggleBMS: ["gBrowserManagerSidebar.controllFunctions.toggleBMSShortcut()", "show-bms", "bms-action"],
|
|
||||||
togglePanel: ["gBrowserManagerSidebar.controllFunctions.togglePanelShortcut()", "show-current-panel", "bms-action"],
|
|
||||||
showPanel1: ["gBrowserManagerSidebar.contextMenu.showWithNumber(0)", "show-panel-1", "bms-action"],
|
|
||||||
showPanel2: ["gBrowserManagerSidebar.contextMenu.showWithNumber(1)", "show-panel-2", "bms-action"],
|
|
||||||
showPanel3: ["gBrowserManagerSidebar.contextMenu.showWithNumber(2)", "show-panel-3", "bms-action"],
|
|
||||||
showPanel4: ["gBrowserManagerSidebar.contextMenu.showWithNumber(3)", "show-panel-4", "bms-action"],
|
|
||||||
showPanel5: ["gBrowserManagerSidebar.contextMenu.showWithNumber(4)", "show-panel-5", "bms-action"],
|
|
||||||
showPanel6: ["gBrowserManagerSidebar.contextMenu.showWithNumber(5)", "show-panel-6", "bms-action"],
|
|
||||||
showPanel7: ["gBrowserManagerSidebar.contextMenu.showWithNumber(6)", "show-panel-7", "bms-action"],
|
|
||||||
showPanel8: ["gBrowserManagerSidebar.contextMenu.showWithNumber(7)", "show-panel-8", "bms-action"],
|
|
||||||
showPanel9: ["gBrowserManagerSidebar.contextMenu.showWithNumber(8)", "show-panel-9", "bms-action"],
|
|
||||||
showPanel10: ["gBrowserManagerSidebar.contextMenu.showWithNumber(9)", "show-panel-10", "bms-action"],
|
|
||||||
|
|
||||||
// Split View actions
|
|
||||||
openSplitViewOnLeft: ["gSplitView.Functions.setSplitView(gBrowser.selectedTab, 'left')", "open-split-view-on-left", "split-view-action"],
|
|
||||||
openSplitViewOnRight: ["gSplitView.Functions.setSplitView(gBrowser.selectedTab, 'right')", "open-split-view-on-right", "split-view-action"],
|
|
||||||
closeSplitView: ["gSplitView.Functions.removeSplitView()", "close-split-view", "split-view-action"],
|
|
||||||
|
|
||||||
// Custom actions
|
// Custom actions
|
||||||
customAction1: ["gZenKeyboardShortcutsFunctions.evalCustomeActionWithNum(1)", "custom-action-1", "custom-action"],
|
customAction1: ["gZenKeyboardShortcutsFunctions.evalCustomeActionWithNum(1)", "custom-action-1", "custom-action"],
|
||||||
customAction2: ["gZenKeyboardShortcutsFunctions.evalCustomeActionWithNum(2)", "custom-action-2", "custom-action"],
|
customAction2: ["gZenKeyboardShortcutsFunctions.evalCustomeActionWithNum(2)", "custom-action-2", "custom-action"],
|
||||||
|
@ -119,9 +92,23 @@ const kZKSActions = {
|
||||||
// Section: ZenKeyboardShortcuts
|
// 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",
|
||||||
|
};
|
||||||
|
|
||||||
var gZenKeyboardShortcuts = {
|
var gZenKeyboardShortcuts = {
|
||||||
init() {
|
init() {
|
||||||
return;
|
|
||||||
this._initShortcuts();
|
this._initShortcuts();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -136,24 +123,34 @@ var gZenKeyboardShortcuts = {
|
||||||
return this.__savedShortcuts;
|
return this.__savedShortcuts;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
setShortcut(id, shortcut) {
|
||||||
|
if (!shortcut) {
|
||||||
|
delete this._savedShortcuts[id];
|
||||||
|
} else if (this.isValidShortcut(shortcut)) {
|
||||||
|
this._savedShortcuts[id] = shortcut;
|
||||||
|
}
|
||||||
|
Services.prefs.setStringPref(kZKSStorageKey, JSON.stringify(this._savedShortcuts));
|
||||||
|
},
|
||||||
|
|
||||||
_initShortcuts() {
|
_initShortcuts() {
|
||||||
if (window.location.href == "chrome://browser/content/browser.xhtml") {
|
if (window.location.href == "chrome://browser/content/browser.xhtml") {
|
||||||
|
Services.prefs.addObserver(kZKSStorageKey, this._initSavedShortcuts.bind(this));
|
||||||
this._initSavedShortcuts();
|
this._initSavedShortcuts();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
_createShortcutElement(action) {
|
_createShortcutElement(_action) {
|
||||||
let shortcut = this._savedShortcuts[action];
|
let shortcut = this._savedShortcuts[_action];
|
||||||
if (!shortcut) {
|
if (!shortcut) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const action = kZKSActions[action][0];
|
const action = kZKSActions[_action][0];
|
||||||
const keycode = shortcut.keycode;
|
const keycode = shortcut.keycode?.toUpperCase();
|
||||||
const key = shortcut.key;
|
const key = shortcut.key?.toUpperCase();
|
||||||
const modifiers = {
|
let modifiers = {
|
||||||
|
control: shortcut.ctrl,
|
||||||
alt: shortcut.alt,
|
alt: shortcut.alt,
|
||||||
ctrl: shortcut.ctrl,
|
|
||||||
shift: shortcut.shift,
|
shift: shortcut.shift,
|
||||||
meta: shortcut.meta
|
meta: shortcut.meta
|
||||||
};
|
};
|
||||||
|
@ -161,9 +158,10 @@ var gZenKeyboardShortcuts = {
|
||||||
modifiers = Object.keys(modifiers).filter(mod => modifiers[mod]).join(",");
|
modifiers = Object.keys(modifiers).filter(mod => modifiers[mod]).join(",");
|
||||||
|
|
||||||
if (keycode) {
|
if (keycode) {
|
||||||
|
const key = kZKSKeyCodeMap[keycode] || keycode;
|
||||||
return window.MozXULElement.parseXULToFragment(`
|
return window.MozXULElement.parseXULToFragment(`
|
||||||
<key
|
<key
|
||||||
id="zen-key_${action}"
|
id="zen-key_${_action}"
|
||||||
class="zen-keyboard-shortcut"
|
class="zen-keyboard-shortcut"
|
||||||
keycode="${keycode}"
|
keycode="${keycode}"
|
||||||
oncommand="${action}"
|
oncommand="${action}"
|
||||||
|
@ -173,7 +171,7 @@ var gZenKeyboardShortcuts = {
|
||||||
|
|
||||||
return window.MozXULElement.parseXULToFragment(`
|
return window.MozXULElement.parseXULToFragment(`
|
||||||
<key
|
<key
|
||||||
id="zen-key_${action}"
|
id="zen-key_${_action}"
|
||||||
class="zen-keyboard-shortcut"
|
class="zen-keyboard-shortcut"
|
||||||
key="${key}"
|
key="${key}"
|
||||||
oncommand="${action}"
|
oncommand="${action}"
|
||||||
|
@ -188,12 +186,47 @@ var gZenKeyboardShortcuts = {
|
||||||
}
|
}
|
||||||
|
|
||||||
for (let action in kZKSActions) {
|
for (let action in kZKSActions) {
|
||||||
|
let id = `zen-key_${action}`;
|
||||||
|
let existing = document.getElementById(id);
|
||||||
|
if (existing) {
|
||||||
|
existing.remove();
|
||||||
|
}
|
||||||
let shortcut = this._createShortcutElement(action);
|
let shortcut = this._createShortcutElement(action);
|
||||||
if (shortcut) {
|
if (shortcut) {
|
||||||
keySet.appendChild(shortcut);
|
keySet.appendChild(shortcut);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
|
||||||
|
getShortcut(action) {
|
||||||
|
return this._savedShortcuts[action];
|
||||||
|
},
|
||||||
|
|
||||||
|
isValidShortcut(shortcut) {
|
||||||
|
return shortcut && (shortcut.key || shortcut.keycode);
|
||||||
|
},
|
||||||
|
|
||||||
|
shortCutToString(shortcut) {
|
||||||
|
let str = "";
|
||||||
|
if (shortcut.ctrl) {
|
||||||
|
str += "Ctrl+";
|
||||||
|
}
|
||||||
|
if (shortcut.alt) {
|
||||||
|
str += "Alt+";
|
||||||
|
}
|
||||||
|
if (shortcut.shift) {
|
||||||
|
str += "Shift+";
|
||||||
|
}
|
||||||
|
if (shortcut.meta) {
|
||||||
|
str += "Meta+";
|
||||||
|
}
|
||||||
|
if (shortcut.keycode) {
|
||||||
|
str += shortcut.keycode;
|
||||||
|
} else if (shortcut.key) { // It can be undefined if edited from the settings
|
||||||
|
str += shortcut.key;
|
||||||
|
}
|
||||||
|
return str;
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
gZenKeyboardShortcuts.init();
|
gZenKeyboardShortcuts.init();
|
||||||
|
|
|
@ -19,7 +19,6 @@ var gZenThemeBuilder = {
|
||||||
|
|
||||||
_initBuilderUI() {
|
_initBuilderUI() {
|
||||||
let wrapper = this._builderWrapper;
|
let wrapper = this._builderWrapper;
|
||||||
console.log(wrapper);
|
|
||||||
if (!wrapper) {
|
if (!wrapper) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -177,5 +176,3 @@ var gZenThemeBuilder = {
|
||||||
Services.prefs.setStringPref(kZenAccentColorConfigKey, this._rgbToHex(...imageData.data));
|
Services.prefs.setStringPref(kZenAccentColorConfigKey, this._rgbToHex(...imageData.data));
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
gZenThemeBuilder.init();
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue