fix: closes #7650 - Fixed context menu closing the URL bar, r=no-component

This commit is contained in:
mr. m
2025-04-16 12:05:01 +02:00
parent adbec11c04
commit cb8708d2d9

View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
index 6de4c2ac873b1424abee118a143ac377f26beb80..423e3aab4fd4fff9960caf8b8375d7bfcb90c733 100644
index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862f1d17b8d 100644
--- a/browser/components/urlbar/UrlbarInput.sys.mjs
+++ b/browser/components/urlbar/UrlbarInput.sys.mjs
@@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -138,7 +138,24 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..423e3aab4fd4fff9960caf8b8375d7bf
return where;
}
@@ -4048,6 +4099,11 @@ export class UrlbarInput {
@@ -3625,7 +3676,7 @@ export class UrlbarInput {
pasteAndGo.setAttribute("anonid", "paste-and-go");
pasteAndGo.addEventListener("command", () => {
this._suppressStartQuery = true;
-
+ this.view.close();
this.select();
this.window.goDoCommand("cmd_paste");
this.setResultForCurrentValue(null);
@@ -3638,7 +3689,6 @@ export class UrlbarInput {
contextMenu.addEventListener("popupshowing", () => {
// Close the results pane when the input field contextual menu is open,
// because paste and go doesn't want a result selection.
- this.view.close();
let controller =
this.document.commandDispatcher.getControllerForCommand("cmd_paste");
@@ -4048,6 +4098,11 @@ export class UrlbarInput {
}
_on_click(event) {
@@ -150,7 +167,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..423e3aab4fd4fff9960caf8b8375d7bf
if (
event.target == this.inputField ||
event.target == this._inputContainer ||
@@ -4119,7 +4175,7 @@ export class UrlbarInput {
@@ -4119,7 +4174,7 @@ export class UrlbarInput {
}
}
@@ -159,7 +176,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..423e3aab4fd4fff9960caf8b8375d7bf
this.view.autoOpen({ event });
} else {
if (this._untrimOnFocusAfterKeydown) {
@@ -4159,9 +4215,12 @@ export class UrlbarInput {
@@ -4159,9 +4214,12 @@ export class UrlbarInput {
}
_on_mousedown(event) {
@@ -173,7 +190,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..423e3aab4fd4fff9960caf8b8375d7bf
if (
event.target != this.inputField &&
@@ -4171,8 +4230,8 @@ export class UrlbarInput {
@@ -4171,8 +4229,8 @@ export class UrlbarInput {
break;
}