diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 3a8365b9..2e6c4948 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,4 +1,4 @@ -blank_issues_enabled: false +blank_issues_enabled: false contact_links: - name: Feature Request url: https://github.com/zen-browser/desktop/discussions diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33ccfa66..5d0a7c5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -206,7 +206,7 @@ jobs: contents: write runs-on: ubuntu-latest needs: [build-data, check-release] - + steps: - name: Install Node.js uses: actions/setup-node@v3 @@ -341,7 +341,7 @@ jobs: run: | npm install -g pnpm sudo apt-get update - sudo apt-get -y install libfuse2 desktop-file-utils appstream + sudo apt-get -y install libfuse2 desktop-file-utils appstream - name: Download linux build uses: actions/download-artifact@v4 @@ -431,7 +431,7 @@ jobs: mkdir -p updates cp -a ../linux_update_manifest_generic/. updates/ cp -a ../linux_update_manifest_specific/. updates/ - cp -a ../linux_update_manifest_aarch64/. updates/ + cp -a ../linux_update_manifest_aarch64/. updates/ if [[ $RELEASE_BRANCH == 'alpha' ]]; then cp -a ../.github/workflows/object/windows-x64-signed-generic/update_manifest/. updates/ diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml index f311a87e..ea46d01c 100644 --- a/.github/workflows/linux-release-build.yml +++ b/.github/workflows/linux-release-build.yml @@ -13,7 +13,7 @@ on: jobs: build-linux: - + permissions: contents: write runs-on: ubuntu-latest diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml index c72c4679..55c09ffc 100644 --- a/.github/workflows/macos-release-build.yml +++ b/.github/workflows/macos-release-build.yml @@ -14,7 +14,7 @@ on: jobs: mac-build: name: Build macOS - ${{ matrix.arch }} - + runs-on: macos-14 strategy: fail-fast: false @@ -98,7 +98,7 @@ jobs: - name: Install dependencies run: | pnpm install - + - name: Load surfer CI setup run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }} diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 67832d0b..aa18c621 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -5,7 +5,7 @@ on: pull_request: branches: - dev - + jobs: pr-test: runs-on: ubuntu-latest diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml index c1e881ee..fbf3aa5f 100644 --- a/.github/workflows/windows-profile-build.yml +++ b/.github/workflows/windows-profile-build.yml @@ -61,13 +61,13 @@ jobs: C:\MozillaBuildSetup-Latest.exe /S | out-null - name: Download firefox run: | - git config --global core.safecrlf false + git config --global core.safecrlf false pnpm surfer download - name: Import patches env: SURFER_NO_BRANDING_PATCH: true - run: pnpm surfer import + run: pnpm surfer import - name: Generate run: | diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml index 681b98a6..1f5a2541 100644 --- a/.github/workflows/windows-release-build.yml +++ b/.github/workflows/windows-release-build.yml @@ -26,7 +26,7 @@ jobs: fail-fast: false matrix: arch: [x86_64, x86_64-v3, aarch64] - + steps: - name: Free Disk Space (Ubuntu) uses: jlumbroso/free-disk-space@main @@ -223,7 +223,7 @@ jobs: find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type d -not -name 'dist' -exec rm -rf {} \; find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type f -not -name 'dist' -exec rm -f {} \; fi - + - name: Upload dist object if: ${{ !inputs.generate-gpo }} uses: actions/upload-artifact@v4 diff --git a/src/browser/base/content/ZenCustomizableUI.sys.mjs b/src/browser/base/content/ZenCustomizableUI.sys.mjs index c2359b74..88c0a42e 100644 --- a/src/browser/base/content/ZenCustomizableUI.sys.mjs +++ b/src/browser/base/content/ZenCustomizableUI.sys.mjs @@ -34,7 +34,7 @@ export var ZenCustomizableUI = new (class { _addSidebarButtons(window) { const sidebarBox = window.MozXULElement.parseXULToFragment(` - @@ -96,7 +96,7 @@ - + diff --git a/src/browser/base/content/zen-sidebar-icons.inc.xhtml b/src/browser/base/content/zen-sidebar-icons.inc.xhtml index 31a4e40c..879a55cc 100644 --- a/src/browser/base/content/zen-sidebar-icons.inc.xhtml +++ b/src/browser/base/content/zen-sidebar-icons.inc.xhtml @@ -1,13 +1,13 @@ - - - + diff --git a/src/browser/base/content/zen-styles/zen-animations.css b/src/browser/base/content/zen-styles/zen-animations.css index b6fe193f..43827a33 100644 --- a/src/browser/base/content/zen-styles/zen-animations.css +++ b/src/browser/base/content/zen-styles/zen-animations.css @@ -307,7 +307,7 @@ } 90% { - width: 100%; + width: 100%; } 100% { diff --git a/src/browser/base/content/zen-styles/zen-browser-container.css b/src/browser/base/content/zen-styles/zen-browser-container.css index b165cd29..bf4613eb 100644 --- a/src/browser/base/content/zen-styles/zen-browser-container.css +++ b/src/browser/base/content/zen-styles/zen-browser-container.css @@ -8,7 +8,7 @@ border-radius: var(--zen-border-radius); overflow: hidden; margin: 1px; - + :root[zen-right-side='true'] & { margin-right: 0; margin-left: var(--zen-element-separation); diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css index 0d1055e5..c3d9bc4d 100644 --- a/src/browser/base/content/zen-styles/zen-browser-ui.css +++ b/src/browser/base/content/zen-styles/zen-browser-ui.css @@ -51,7 +51,7 @@ #zen-main-app-wrapper { background: transparent; overflow: hidden; - + & > * { z-index: 1; } diff --git a/src/browser/base/content/zen-styles/zen-sidebar-panels.css b/src/browser/base/content/zen-styles/zen-sidebar-panels.css index 891aac3f..fced7c98 100644 --- a/src/browser/base/content/zen-styles/zen-sidebar-panels.css +++ b/src/browser/base/content/zen-styles/zen-sidebar-panels.css @@ -70,7 +70,7 @@ z-index: 1; width: calc(100% - var(--zen-sidebar-web-panel-spacing) * 3); margin: var(--zen-sidebar-web-panel-spacing); - /* Why times 3? + /* Why times 3? * + 1 for the top margin, making the element overflow the view. * + 1 for the margin we want to add at the bottom * + 1 so that the panel can be correctly spaced from the border of the webview diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs-topbar.inc.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs-topbar.inc.css index 8cf35794..a789dadb 100644 --- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs-topbar.inc.css +++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs-topbar.inc.css @@ -1,6 +1,6 @@ height: var(--zen-toolbar-height); -@media (-moz-bool-pref: 'zen.view.hide-window-controls') { +@media (-moz-bool-pref: 'zen.view.hide-window-controls') { & { transition: height 0.2s ease-out, opacity 0.2s ease-out; transition-delay: 0.05s; diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css index e749532b..75098912 100644 --- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css +++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css @@ -12,8 +12,8 @@ & #zen-sidebar-top-buttons { --zen-toolbar-height: 32px; height: var(--zen-toolbar-height); - } - + } + & #zen-sidebar-top-buttons .toolbarbutton-1 { & > .toolbarbutton-icon { padding: 5px; @@ -139,8 +139,8 @@ & #PersonalToolbar { width: -moz-available; } - - /* We enable this trick IF we follow any of theses conditions: + + /* We enable this trick IF we follow any of theses conditions: * - We are on a Mac * - We are on a Linux with reversed CSD * - If we are not in any of the above, we can still enable it if the user has bookmarks toolbar enabled @@ -256,8 +256,8 @@ } & label { display: none !important; } & .tab-close-button, - & .tab-reset-button { - display: none !important; + & .tab-reset-button { + display: none !important; } & .tab-icon-image { @@ -346,11 +346,11 @@ & .urlbar-input-container { padding-left: 2px; } - + :root[zen-right-side='true'] & { margin-left: 0; margin-right: var(--zen-toolbox-padding); - + & .urlbar-input-container { padding-right: 2px; } diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css index 8491e2be..3a8b9e8a 100644 --- a/src/browser/base/content/zen-styles/zen-urlbar.css +++ b/src/browser/base/content/zen-styles/zen-urlbar.css @@ -53,7 +53,7 @@ outline-color: none !important; } -#identity-box.chromeUI:not([pageproxystate="invalid"]) { +#identity-box.chromeUI:not([pageproxystate="invalid"]) { & #identity-icon-box { background: light-dark(rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0.1)) !important; } @@ -65,7 +65,7 @@ #identity-permission-box:not(:hover):not(:focus-within) { background: transparent !important; -} +} #urlbar:is([focused], [open]) > #urlbar-background, #searchbar:focus-within { @@ -161,7 +161,7 @@ padding: 0; margin-top: auto; margin-bottom: auto; - } + } } } @@ -279,7 +279,7 @@ button.popup-notification-dropmarker { align-items: center; } -:root:not([zen-single-toolbar='true']) #nav-bar { +:root:not([zen-single-toolbar='true']) #nav-bar { margin-bottom: -1px; } diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css index ca7879c8..3db584ff 100644 --- a/src/browser/base/content/zen-styles/zen-workspaces.css +++ b/src/browser/base/content/zen-styles/zen-workspaces.css @@ -60,7 +60,7 @@ filter: grayscale(1); transition: opacity 0.2s; } - + &[active='true'] { filter: none; opacity: 1; @@ -401,7 +401,7 @@ font-weight: 600; align-items: center; position: relative; - + & #zen-current-workspace-indicator-icon { font-size: 14px; } diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs index 8da86357..ced2a785 100644 --- a/src/browser/base/zen-components/ZenGlanceManager.mjs +++ b/src/browser/base/zen-components/ZenGlanceManager.mjs @@ -192,7 +192,7 @@ this.lastCurrentTab.removeAttribute("zen-glance-tab"); this.lastCurrentTab._closingGlance = true; - + gBrowser.tabContainer._invalidateCachedTabs(); gBrowser.removeTab(this.lastCurrentTab, { animate: true }); @@ -200,10 +200,10 @@ this.#currentBrowser = null; this.lastCurrentTab = null; - this._duringOpening = false; + this._duringOpening = false; }, 400); }); - }); + }); } quickOpenGlance() { @@ -231,7 +231,7 @@ quickCloseGlance({ closeCurrentTab = true, closeParentTab = true, justAnimateParent = false } = {}) { const parentHasBrowser = !!(this.currentParentTab.linkedBrowser); - if (!justAnimateParent) { + if (!justAnimateParent) { if (parentHasBrowser) { if (closeParentTab) { this.currentParentTab.linkedBrowser.closest(".browserSidebarContainer").classList.remove("deck-selected"); @@ -277,7 +277,7 @@ } } - fullyOpenGlance() { + fullyOpenGlance() { gBrowser._insertTabAtIndex(this.#currentTab, { index: this.#currentTab._tPos + 1, }); diff --git a/src/browser/base/zen-components/ZenGradientGenerator.mjs b/src/browser/base/zen-components/ZenGradientGenerator.mjs index ddc8ddbc..1059defb 100644 --- a/src/browser/base/zen-components/ZenGradientGenerator.mjs +++ b/src/browser/base/zen-components/ZenGradientGenerator.mjs @@ -19,7 +19,7 @@ ChromeUtils.defineLazyGetter(this, 'panel', () => document.getElementById('PanelUI-zen-gradient-generator')); ChromeUtils.defineLazyGetter(this, 'toolbox', () => document.getElementById('TabsToolbar')); ChromeUtils.defineLazyGetter(this, 'customColorInput', () => document.getElementById('PanelUI-zen-gradient-generator-custom-input')); - ChromeUtils.defineLazyGetter(this, 'customColorList', () => document.getElementById('PanelUI-zen-gradient-generator-custom-list')); + ChromeUtils.defineLazyGetter(this, 'customColorList', () => document.getElementById('PanelUI-zen-gradient-generator-custom-list')); XPCOMUtils.defineLazyPreferenceGetter( this, @@ -74,7 +74,7 @@ this.image.onload = this.onImageLoad.bind(this); } - + onImageLoad() { // resize the image to fit the panel const imageSize = 300 - 20; // 20 is the padding (10px) @@ -164,11 +164,11 @@ this.rotationInputDot.style.transform = `rotate(${degrees - 20}deg)`; this.rotationInputText.textContent = `${fixedRotation}°`; } - + initCustomColorInput() { this.customColorInput.addEventListener('keydown', this.onCustomColorKeydown.bind(this)); } - + onCustomColorKeydown(event) { //checks for enter key for custom colors if (event.key === 'Enter') { @@ -246,19 +246,19 @@ onThemePickerClick(event) { event.preventDefault(); - + if (event.button !== 0 || this.dragging ) return; - + const gradient = this.panel.querySelector('.zen-theme-picker-gradient'); const rect = gradient.getBoundingClientRect(); const padding = 90; // each side - + const centerX = rect.left + rect.width / 2; const centerY = rect.top + rect.height / 2; const radius = (rect.width - padding) / 2; let pixelX = event.clientX; let pixelY = event.clientY; - + // Check if the click is within the circle const distance = Math.sqrt((pixelX - centerX) ** 2 + (pixelY - centerY) ** 2); if (distance > radius) { @@ -268,33 +268,33 @@ // Check if we clicked on an existing dot const clickedElement = event.target; const isExistingDot = clickedElement.classList.contains('zen-theme-picker-dot'); - + // Only proceed if not clicking on an existing dot if (!isExistingDot) { - + const relativeX = event.clientX - rect.left; const relativeY = event.clientY - rect.top; - - + + const color = this.getColorFromPosition(relativeX, relativeY); - + // Create new dot const dot = document.createElement('div'); dot.classList.add('zen-theme-picker-dot'); dot.addEventListener('mousedown', this.onDotMouseDown.bind(this)); - + dot.style.left = `${relativeX}px`; dot.style.top = `${relativeY}px`; dot.style.setProperty('--zen-theme-picker-dot-color', `rgb(${color[0]}, ${color[1]}, ${color[2]})`); - + gradient.appendChild(dot); - + this.updateCurrentWorkspace(true); } } - - + + onDotMouseDown(event) { event.preventDefault(); @@ -305,7 +305,7 @@ this.draggedDot = event.target; this.draggedDot.style.zIndex = 1; this.draggedDot.classList.add('dragging'); - + // Store the starting position of the drag this.dragStartPosition = { x: event.clientX, @@ -320,9 +320,9 @@ const rect = this.panel.querySelector('.zen-theme-picker-gradient').getBoundingClientRect(); const padding = 90; // each side // do NOT let the ball be draged outside of an imaginary circle. You can drag it anywhere inside the circle - // if the distance between the center of the circle and the dragged ball is bigger than the radius, then the ball + // if the distance between the center of the circle and the dragged ball is bigger than the radius, then the ball // should be placed on the edge of the circle. If it's inside the circle, then the ball just follows the mouse - + const centerX = rect.left + rect.width / 2; const centerY = rect.top + rect.height / 2; const radius = (rect.width - padding) / 2; @@ -358,18 +358,18 @@ listItems.querySelector('.zen-theme-picker-dot-custom').style.setProperty('--zen-theme-picker-dot-color', color); listItems.querySelector('.zen-theme-picker-custom-list-item-label').textContent = color; - + this.customColorList.appendChild(listItems); } async addCustomColor() { - + const color = this.customColorInput.value; if (!color) { - + return; } - + // can be any color format, we just add it to the list as a dot, but hidden const dot = document.createElement('div'); @@ -385,46 +385,46 @@ onThemePickerClick(event) { event.preventDefault(); - + if (event.button !== 0 || this.dragging) return; - + const gradient = this.panel.querySelector('.zen-theme-picker-gradient'); const rect = gradient.getBoundingClientRect(); const padding = 90; // each side - + const centerX = rect.left + rect.width / 2; const centerY = rect.top + rect.height / 2; const radius = (rect.width - padding) / 2; let pixelX = event.clientX; let pixelY = event.clientY; - + // Check if the click is within the circle const distance = Math.sqrt((pixelX - centerX) ** 2 + (pixelY - centerY) ** 2); if (distance > radius) { - return; + return; } - + const clickedElement = event.target; const isExistingDot = clickedElement.classList.contains('zen-theme-picker-dot'); - - + + if (!isExistingDot && this.numberOfDots < ZenThemePicker.MAX_DOTS) { const relativeX = event.clientX - rect.left; const relativeY = event.clientY - rect.top; - + const color = this.getColorFromPosition(relativeX, relativeY); - + const dot = document.createElement('div'); dot.classList.add('zen-theme-picker-dot'); dot.addEventListener('mousedown', this.onDotMouseDown.bind(this)); - + dot.style.left = `${relativeX}px`; dot.style.top = `${relativeY}px`; dot.style.setProperty('--zen-theme-picker-dot-color', `rgb(${color[0]}, ${color[1]}, ${color[2]})`); - + gradient.appendChild(dot); - + this.updateCurrentWorkspace(true); } } @@ -438,7 +438,7 @@ this.draggedDot = event.target; this.draggedDot.style.zIndex = 1; this.draggedDot.classList.add('dragging'); - + // Store the starting position of the drag this.dragStartPosition = { x: event.clientX, @@ -459,7 +459,7 @@ if (this.dragging) { event.preventDefault(); - event.stopPropagation(); + event.stopPropagation(); this.dragging = false; this.draggedDot.style.zIndex = 1; this.draggedDot.classList.remove('dragging'); @@ -586,13 +586,13 @@ } } const result = this.pSBC( - this.isDarkMode ? 0.2 : -0.5, + this.isDarkMode ? 0.2 : -0.5, `rgb(${dominantColor[0]}, ${dominantColor[1]}, ${dominantColor[2]})`); return result?.match(/\d+/g).map(Number); } async onWorkspaceChange(workspace, skipUpdate = false, theme = null) { - + const uuid = workspace.uuid; // Use theme from workspace object or passed theme let workspaceTheme = theme || workspace.theme; @@ -615,7 +615,7 @@ dot.remove(); } } - + const appWrapper = browser.document.getElementById('zen-main-app-wrapper'); if (!skipUpdate) { @@ -655,7 +655,7 @@ const gradient = browser.gZenThemePicker.getGradient(workspaceTheme.gradientColors); const gradientToolbar = browser.gZenThemePicker.getGradient(workspaceTheme.gradientColors, true); browser.gZenThemePicker.updateNoise(workspaceTheme.texture); - + for (const dot of workspaceTheme.gradientColors) { if (dot.isCustom) { browser.gZenThemePicker.addColorToCustomList(dot.c); diff --git a/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs b/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs index 288fa566..b9dcdeae 100644 --- a/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs +++ b/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs @@ -874,7 +874,7 @@ var gZenKeyboardShortcutsManager = { browser.gZenKeyboardShortcutsManager._zenKeyset = browser.document.createXULElement('keyset'); browser.gZenKeyboardShortcutsManager._zenKeyset.id = ZEN_KEYSET_ID; - + const mainKeyset = browser.document.getElementById(ZEN_MAIN_KEYSET_ID); mainKeyset.after(browser.gZenKeyboardShortcutsManager._zenKeyset); } diff --git a/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs b/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs index a93aaffe..df4a8409 100644 --- a/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs +++ b/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs @@ -149,8 +149,8 @@ var ZenPinnedTabsStorage = { async getGroupChildren(groupUuid) { const db = await PlacesUtils.promiseDBConnection(); const rows = await db.executeCached(` - SELECT * FROM zen_pins - WHERE parent_uuid = :groupUuid + SELECT * FROM zen_pins + WHERE parent_uuid = :groupUuid ORDER BY position ASC `, { groupUuid }); diff --git a/src/browser/base/zen-components/ZenSidebarManager.mjs b/src/browser/base/zen-components/ZenSidebarManager.mjs index d3a1011c..193403be 100644 --- a/src/browser/base/zen-components/ZenSidebarManager.mjs +++ b/src/browser/base/zen-components/ZenSidebarManager.mjs @@ -17,7 +17,7 @@ class ZenBrowserManagerSidebar extends ZenDOMOperatedFeature { DEFAULT_MOBILE_USER_AGENT = `Mozilla/5.0 (Android 12; Mobile; rv:129.0) Gecko/20100101 Firefox/${AppConstants.ZEN_FIREFOX_VERSION}`; MAX_SIDEBAR_PANELS = Services.prefs.getIntPref('zen.sidebar.max-webpanels'); - + init() { ChromeUtils.defineLazyGetter(this, 'sidebar', () => document.getElementById('zen-sidebar-web-panel')); ChromeUtils.defineLazyGetter(this, 'forwardButton', () => document.getElementById('zen-sidebar-web-panel-forward')); @@ -615,7 +615,7 @@ class ZenBrowserManagerSidebar extends ZenDOMOperatedFeature { this._setPinnedToElements(); this.moveToTabBox(); } - this.update(); + this.update(); } get sidebarElement() { diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs index 15c5272d..1f6b5866 100644 --- a/src/browser/base/zen-components/ZenWorkspaces.mjs +++ b/src/browser/base/zen-components/ZenWorkspaces.mjs @@ -658,7 +658,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
- + diff --git a/src/browser/base/zen-components/ZenWorkspacesStorage.mjs b/src/browser/base/zen-components/ZenWorkspacesStorage.mjs index 8fda26d3..cebb45e6 100644 --- a/src/browser/base/zen-components/ZenWorkspacesStorage.mjs +++ b/src/browser/base/zen-components/ZenWorkspacesStorage.mjs @@ -128,7 +128,7 @@ var ZenWorkspacesStorage = { uuid, name, icon, is_default, container_id, created_at, updated_at, "position", theme_type, theme_colors, theme_opacity, theme_rotation, theme_texture ) VALUES ( - :uuid, :name, :icon, :is_default, :container_id, + :uuid, :name, :icon, :is_default, :container_id, COALESCE((SELECT created_at FROM zen_workspaces WHERE uuid = :uuid), :now), :now, :position, diff --git a/src/browser/base/zen-components/actors/ZenGlanceChild.sys.mjs b/src/browser/base/zen-components/actors/ZenGlanceChild.sys.mjs index fc6c6eca..efec6ae2 100644 --- a/src/browser/base/zen-components/actors/ZenGlanceChild.sys.mjs +++ b/src/browser/base/zen-components/actors/ZenGlanceChild.sys.mjs @@ -62,7 +62,7 @@ export class ZenGlanceChild extends JSWindowActorChild { url = this.contentWindow.location.origin + url; } const rect = target.getBoundingClientRect(); - this.sendAsyncMessage('ZenGlance:OpenGlance', { + this.sendAsyncMessage('ZenGlance:OpenGlance', { url, x: rect.left, y: rect.top, @@ -117,7 +117,7 @@ export class ZenGlanceChild extends JSWindowActorChild { if (target) { event.preventDefault(); event.stopPropagation(); - + this.openGlance(target); } } diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js index fddc69f3..e0961cc1 100644 --- a/src/browser/components/preferences/zen-settings.js +++ b/src/browser/components/preferences/zen-settings.js @@ -1024,7 +1024,7 @@ Preferences.addAll([ { id: "zen.glance.activation-method", type: "string", - default: "ctrl", + default: "ctrl", }, { id: "zen.glance.enabled", diff --git a/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml b/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml index b1d0cc52..05fd6910 100644 --- a/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml +++ b/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml @@ -11,7 +11,7 @@ -