mirror of
https://github.com/zen-browser/desktop.git
synced 2025-10-05 09:26:34 +00:00
Always fire the popup hidden event for customizable UI popups (https://github.com/zen-browser/desktop/issues/2743#)
This commit is contained in:
@@ -82,7 +82,6 @@ export class ZenGlanceChild extends JSWindowActorChild {
|
|||||||
|
|
||||||
async handleMouseDown(event) {
|
async handleMouseDown(event) {
|
||||||
const target = event.target.closest('A');
|
const target = event.target.closest('A');
|
||||||
console.log('target', target);
|
|
||||||
if (!target) {
|
if (!target) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
|
||||||
|
index 1805bad6c58e060533f634ed9e511c05cad3ded1..4eb04f3eb1b9dd1c5d663cca0a7ad903b38c4efd 100644
|
||||||
|
--- a/browser/components/customizableui/content/panelUI.js
|
||||||
|
+++ b/browser/components/customizableui/content/panelUI.js
|
||||||
|
@@ -545,7 +545,7 @@ const PanelUI = {
|
||||||
|
|
||||||
|
if (viewShown) {
|
||||||
|
CustomizableUI.addPanelCloseListeners(tempPanel);
|
||||||
|
- tempPanel.addEventListener("popuphidden", panelRemover);
|
||||||
|
+ tempPanel.addEventListener("popuphidden", panelRemover, { capture: true });
|
||||||
|
} else {
|
||||||
|
panelRemover();
|
||||||
|
}
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
|
diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
|
||||||
index c504c9afc43785b5f003bb1f9f1dfbddef38d78b..986c629b88b635a71bd795bd115b9a72a3481500 100644
|
index c504c9afc43785b5f003bb1f9f1dfbddef38d78b..b08cb1d9fee5f76070c70ea928209b15b6146cb3 100644
|
||||||
--- a/browser/components/urlbar/UrlbarInput.sys.mjs
|
--- a/browser/components/urlbar/UrlbarInput.sys.mjs
|
||||||
+++ b/browser/components/urlbar/UrlbarInput.sys.mjs
|
+++ b/browser/components/urlbar/UrlbarInput.sys.mjs
|
||||||
@@ -65,6 +65,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
|
@@ -65,6 +65,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
|
||||||
@@ -16,26 +16,17 @@ index c504c9afc43785b5f003bb1f9f1dfbddef38d78b..986c629b88b635a71bd795bd115b9a72
|
|||||||
const DEFAULT_FORM_HISTORY_NAME = "searchbar-history";
|
const DEFAULT_FORM_HISTORY_NAME = "searchbar-history";
|
||||||
const SEARCH_BUTTON_CLASS = "urlbar-search-button";
|
const SEARCH_BUTTON_CLASS = "urlbar-search-button";
|
||||||
|
|
||||||
@@ -2154,6 +2161,18 @@ export class UrlbarInput {
|
@@ -2154,6 +2161,9 @@ export class UrlbarInput {
|
||||||
|
|
||||||
this.setAttribute("breakout-extend", "true");
|
this.setAttribute("breakout-extend", "true");
|
||||||
|
|
||||||
+ if (lazy.ZEN_URLBAR_BEHAVIOR == 'float' || (lazy.ZEN_URLBAR_BEHAVIOR == 'floating-on-type' && !this.focusedViaMousedown)) {
|
+ if (lazy.ZEN_URLBAR_BEHAVIOR == 'float' || (lazy.ZEN_URLBAR_BEHAVIOR == 'floating-on-type' && !this.focusedViaMousedown)) {
|
||||||
+ this.setAttribute("zen-floating-urlbar", "true");
|
+ this.setAttribute("zen-floating-urlbar", "true");
|
||||||
+ } else this.removeAttribute("zen-floating-urlbar");
|
+ } else this.removeAttribute("zen-floating-urlbar");
|
||||||
+ if (lazy.UrlbarPrefs.get("closeOtherPanelsOnOpen")) {
|
|
||||||
+ setTimeout(() => {
|
|
||||||
+ this.window.docShell.treeOwner
|
|
||||||
+ .QueryInterface(Ci.nsIInterfaceRequestor)
|
|
||||||
+ .getInterface(Ci.nsIAppWindow)
|
|
||||||
+ .rollupAllPopups();
|
|
||||||
+ });
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
// Enable the animation only after the first extend call to ensure it
|
// Enable the animation only after the first extend call to ensure it
|
||||||
// doesn't run when opening a new window.
|
// doesn't run when opening a new window.
|
||||||
if (!this.hasAttribute("breakout-extend-animate")) {
|
if (!this.hasAttribute("breakout-extend-animate")) {
|
||||||
@@ -3901,6 +3920,11 @@ export class UrlbarInput {
|
@@ -3901,6 +3911,11 @@ export class UrlbarInput {
|
||||||
}
|
}
|
||||||
|
|
||||||
_on_click(event) {
|
_on_click(event) {
|
||||||
@@ -47,7 +38,7 @@ index c504c9afc43785b5f003bb1f9f1dfbddef38d78b..986c629b88b635a71bd795bd115b9a72
|
|||||||
if (
|
if (
|
||||||
event.target == this.inputField ||
|
event.target == this.inputField ||
|
||||||
event.target == this._inputContainer ||
|
event.target == this._inputContainer ||
|
||||||
@@ -4012,9 +4036,12 @@ export class UrlbarInput {
|
@@ -4012,9 +4027,12 @@ export class UrlbarInput {
|
||||||
}
|
}
|
||||||
|
|
||||||
_on_mousedown(event) {
|
_on_mousedown(event) {
|
||||||
@@ -61,7 +52,7 @@ index c504c9afc43785b5f003bb1f9f1dfbddef38d78b..986c629b88b635a71bd795bd115b9a72
|
|||||||
|
|
||||||
if (
|
if (
|
||||||
event.target != this.inputField &&
|
event.target != this.inputField &&
|
||||||
@@ -4024,8 +4051,8 @@ export class UrlbarInput {
|
@@ -4024,8 +4042,8 @@ export class UrlbarInput {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user