mirror of
https://github.com/zen-browser/desktop.git
synced 2026-07-18 14:41:05 +00:00
Merge branch 'dev' of https://github.com/zen-browser/desktop into dev
This commit is contained in:
13
src/browser/components/tabbrowser/TabsList-sys-mjs.patch
Normal file
13
src/browser/components/tabbrowser/TabsList-sys-mjs.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/browser/components/tabbrowser/TabsList.sys.mjs b/browser/components/tabbrowser/TabsList.sys.mjs
|
||||
index 97990af166b63cae4b0343c77da5084850890504..b58d20eb3db82867030292625d45277afce1bbea 100644
|
||||
--- a/browser/components/tabbrowser/TabsList.sys.mjs
|
||||
+++ b/browser/components/tabbrowser/TabsList.sys.mjs
|
||||
@@ -87,7 +87,7 @@ class TabsListBase {
|
||||
/** @type {function(MozTabbrowserTab):boolean} */
|
||||
this.filterFn = onlyHiddenTabs
|
||||
? tab => filterFn(tab) && tab.hidden
|
||||
- : filterFn;
|
||||
+ : tab => !tab.hasAttribute("zen-empty-tab") && filterFn(tab);
|
||||
/** @type {Element} */
|
||||
this.containerNode = containerNode;
|
||||
/** @type {Element|null} */
|
||||
@@ -1,12 +1,12 @@
|
||||
diff --git a/browser/components/urlbar/UrlbarController.sys.mjs b/browser/components/urlbar/UrlbarController.sys.mjs
|
||||
index 36e3ab4a5a153230bb488b66dda7e3e7c763ca23..81f2944b939ac0963c129f86aab0b55817349401 100644
|
||||
index 36e3ab4a5a153230bb488b66dda7e3e7c763ca23..cc4ea61914a316451fa54b01a5c8c6a305e4038a 100644
|
||||
--- a/browser/components/urlbar/UrlbarController.sys.mjs
|
||||
+++ b/browser/components/urlbar/UrlbarController.sys.mjs
|
||||
@@ -434,6 +434,8 @@ export class UrlbarController {
|
||||
});
|
||||
}
|
||||
event.preventDefault();
|
||||
+ } else {
|
||||
+ } else if (!this.input.value && !(event.ctrlKey || event.altKey || event.shiftKey)) {
|
||||
+ this.browserWindow.gZenUIManager.enableCommandsMode(event);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -1,18 +1,8 @@
|
||||
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
|
||||
index 70f268914f1078ef45e86d295f4bb2ce179a05e0..73d8ffc4457468e8a57ad2c29e4d49f45436bf00 100644
|
||||
index 70f268914f1078ef45e86d295f4bb2ce179a05e0..9eb138023bc9de6211a3e814b0525da612156a78 100644
|
||||
--- a/browser/installer/package-manifest.in
|
||||
+++ b/browser/installer/package-manifest.in
|
||||
@@ -361,17 +361,17 @@ bin/libfreebl_64int_3.so
|
||||
; [MaintenanceService]
|
||||
;
|
||||
#ifdef MOZ_MAINTENANCE_SERVICE
|
||||
-@BINPATH@/maintenanceservice.exe
|
||||
-@BINPATH@/maintenanceservice_installer.exe
|
||||
+;@BINPATH@/maintenanceservice.exe
|
||||
+;@BINPATH@/maintenanceservice_installer.exe
|
||||
#endif
|
||||
|
||||
; [Crash Reporter]
|
||||
@@ -369,9 +369,9 @@ bin/libfreebl_64int_3.so
|
||||
;
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
#ifdef XP_MACOSX
|
||||
|
||||
@@ -215,8 +215,10 @@ var gZenUIManager = {
|
||||
!el.contains(showEvent.explicitOriginalTarget) ||
|
||||
(showEvent.explicitOriginalTarget instanceof Element &&
|
||||
showEvent.explicitOriginalTarget?.closest('panel')) ||
|
||||
// See bug #7590: Ignore menupopup elements opening
|
||||
showEvent.explicitOriginalTarget.tagName === 'menupopup'
|
||||
// See bug #7590: Ignore menupopup elements opening.
|
||||
// Also see #10612 for the exclusion of the zen-appcontent-navbar-wrapper
|
||||
(showEvent.explicitOriginalTarget.tagName === 'menupopup' &&
|
||||
el.id !== 'zen-appcontent-navbar-wrapper')
|
||||
) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -43,7 +43,8 @@ body > #confetti {
|
||||
}
|
||||
|
||||
/* Firefox View */
|
||||
#firefox-view-button {
|
||||
#firefox-view-button,
|
||||
#wrapper-firefox-view-button {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user