mirror of
https://github.com/zen-browser/desktop.git
synced 2025-10-05 09:26:34 +00:00
Update URL bar behavior and version numbers in surfer.json
This commit is contained in:
@@ -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 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384b21a7fb0 100644
|
index 50968dc04b527438acf30151f0c2e92f8b45097c..0d4c899a8a0d98d6cac41ecdd1c40df52bd050be 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
|
||||||
@@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
|
@@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
|
||||||
@@ -39,7 +39,20 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384
|
|||||||
// We only need to update the searchModeUI on tab switch conditionally
|
// We only need to update the searchModeUI on tab switch conditionally
|
||||||
// as we only persist searchMode with ScotchBonnet enabled.
|
// as we only persist searchMode with ScotchBonnet enabled.
|
||||||
if (
|
if (
|
||||||
@@ -1087,7 +1102,11 @@ export class UrlbarInput {
|
@@ -697,8 +712,11 @@ export class UrlbarInput {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+ this.document.getElementById("navigator-toolbox").setAttribute("supress-primary-adjustment", true);
|
||||||
|
this.handleNavigation({ event });
|
||||||
|
+ this.document.ownerGlobal.setTimeout(() => {
|
||||||
|
+ this.document.getElementById("navigator-toolbox").removeAttribute("supress-primary-adjustment");
|
||||||
|
+ }, 200);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
@@ -1087,11 +1105,14 @@ export class UrlbarInput {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!result.payload.providesSearchMode) {
|
if (!result.payload.providesSearchMode) {
|
||||||
@@ -52,7 +65,11 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.controller.recordSelectedResult(event, result);
|
this.controller.recordSelectedResult(event, result);
|
||||||
@@ -2144,6 +2163,11 @@ export class UrlbarInput {
|
-
|
||||||
|
if (isCanonized) {
|
||||||
|
this.controller.engagementEvent.record(event, {
|
||||||
|
result,
|
||||||
|
@@ -2144,6 +2165,11 @@ export class UrlbarInput {
|
||||||
|
|
||||||
this.setAttribute("breakout-extend", "true");
|
this.setAttribute("breakout-extend", "true");
|
||||||
|
|
||||||
@@ -64,7 +81,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384
|
|||||||
// 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")) {
|
||||||
@@ -2163,6 +2187,11 @@ export class UrlbarInput {
|
@@ -2163,6 +2189,11 @@ export class UrlbarInput {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,7 +93,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384
|
|||||||
this.removeAttribute("breakout-extend");
|
this.removeAttribute("breakout-extend");
|
||||||
this.#updateTextboxPosition();
|
this.#updateTextboxPosition();
|
||||||
}
|
}
|
||||||
@@ -3305,7 +3334,7 @@ export class UrlbarInput {
|
@@ -3305,7 +3336,7 @@ export class UrlbarInput {
|
||||||
} else {
|
} else {
|
||||||
where = lazy.BrowserUtils.whereToOpenLink(event, false, false);
|
where = lazy.BrowserUtils.whereToOpenLink(event, false, false);
|
||||||
}
|
}
|
||||||
@@ -85,7 +102,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384
|
|||||||
if (where == "current") {
|
if (where == "current") {
|
||||||
where = "tab";
|
where = "tab";
|
||||||
} else if (where == "tab") {
|
} else if (where == "tab") {
|
||||||
@@ -3859,6 +3888,11 @@ export class UrlbarInput {
|
@@ -3859,6 +3890,11 @@ export class UrlbarInput {
|
||||||
}
|
}
|
||||||
|
|
||||||
_on_click(event) {
|
_on_click(event) {
|
||||||
@@ -97,7 +114,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384
|
|||||||
if (
|
if (
|
||||||
event.target == this.inputField ||
|
event.target == this.inputField ||
|
||||||
event.target == this._inputContainer ||
|
event.target == this._inputContainer ||
|
||||||
@@ -3930,7 +3964,7 @@ export class UrlbarInput {
|
@@ -3930,7 +3966,7 @@ export class UrlbarInput {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -106,7 +123,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384
|
|||||||
this.view.autoOpen({ event });
|
this.view.autoOpen({ event });
|
||||||
} else {
|
} else {
|
||||||
if (this._untrimOnFocusAfterKeydown) {
|
if (this._untrimOnFocusAfterKeydown) {
|
||||||
@@ -3970,9 +4004,12 @@ export class UrlbarInput {
|
@@ -3970,9 +4006,12 @@ export class UrlbarInput {
|
||||||
}
|
}
|
||||||
|
|
||||||
_on_mousedown(event) {
|
_on_mousedown(event) {
|
||||||
@@ -120,7 +137,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384
|
|||||||
|
|
||||||
if (
|
if (
|
||||||
event.target != this.inputField &&
|
event.target != this.inputField &&
|
||||||
@@ -3982,8 +4019,8 @@ export class UrlbarInput {
|
@@ -3982,8 +4021,8 @@ export class UrlbarInput {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -19,7 +19,7 @@
|
|||||||
"brandShortName": "Zen",
|
"brandShortName": "Zen",
|
||||||
"brandFullName": "Zen Browser",
|
"brandFullName": "Zen Browser",
|
||||||
"release": {
|
"release": {
|
||||||
"displayVersion": "1.7.5b",
|
"displayVersion": "1.7.6b",
|
||||||
"github": {
|
"github": {
|
||||||
"repo": "zen-browser/desktop"
|
"repo": "zen-browser/desktop"
|
||||||
},
|
},
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
"brandShortName": "Zen",
|
"brandShortName": "Zen",
|
||||||
"brandFullName": "Zen Twilight",
|
"brandFullName": "Zen Twilight",
|
||||||
"release": {
|
"release": {
|
||||||
"displayVersion": "1.7.6t",
|
"displayVersion": "1.7.7t",
|
||||||
"github": {
|
"github": {
|
||||||
"repo": "zen-browser/desktop"
|
"repo": "zen-browser/desktop"
|
||||||
}
|
}
|
||||||
@@ -53,4 +53,4 @@
|
|||||||
"licenseType": "MPL-2.0"
|
"licenseType": "MPL-2.0"
|
||||||
},
|
},
|
||||||
"updateHostname": "updates.zen-browser.app"
|
"updateHostname": "updates.zen-browser.app"
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user