URL bar now opens instead of a newtab (optional, on by default)

src/browser/app/profile/zen-browser.js

@@ -122,6 +122,7 @@ pref('zen.view.compact.color-toolbar', true);
 pref('zen.view.compact.color-sidebar', true);
 pref('zen.view.compact.animate-sidebar', true);
 
+pref('zen.urlbar.replace-newtab', true);
 pref('zen.urlbar.behavior', 'floating-on-type'); // default, floating-on-type, float
 
 #ifdef XP_MACOSX

src/browser/base/content/ZenUIManager.mjs

@@ -142,6 +142,24 @@ var gZenUIManager = {
     this.__currentPopup = null;
     this.__currentPopupTrackElement = null;
   },
+
+  handleNewTab(werePassedURL, searchClipboard, where) {
+    const shouldOpenURLBar = Services.prefs.getBoolPref('zen.urlbar.replace-newtab')
+      && !werePassedURL && !searchClipboard && where === 'tab';
+    if (shouldOpenURLBar) {
+      gURLBar._untrimmedValue = "";
+      gURLBar._zenHandleUrlbarClose = this.handleUrlbarClose.bind(this);
+      gURLBar.setAttribute('zen-newtab', true);
+      document.getElementById('Browser:OpenLocation').doCommand();
+      return true;
+    }
+    return false;
+  },
+
+  handleUrlbarClose() {
+    gURLBar.removeAttribute('zen-newtab');
+    gURLBar._zenHandleUrlbarClose = null;
+  },
 };
 
 var gZenVerticalTabsManager = {

src/browser/base/content/browser-commands-js.patch

@@ -1,8 +1,19 @@
 diff --git a/browser/base/content/browser-commands.js b/browser/base/content/browser-commands.js
-index 352de44dda36e3f6672eb353f42978ede0cd2681..d6956a318c34bfb12b0ba957edab1166e1a4edaf 100644
+index 352de44dda36e3f6672eb353f42978ede0cd2681..66d1616da17df3430cec0994a346f0f446944f1a 100644
 --- a/browser/base/content/browser-commands.js
 +++ b/browser/base/content/browser-commands.js
-@@ -407,8 +407,8 @@ var BrowserCommands = {
+@@ -318,6 +318,10 @@ var BrowserCommands = {
+       }
+     }
+ 
++    if (gZenUIManager.handleNewTab(werePassedURL, searchClipboard, where)) {
++      return;
++    }
++
+     // A notification intended to be useful for modular peformance tracking
+     // starting as close as is reasonably possible to the time when the user
+     // expressed the intent to open a new tab.  Since there are a lot of
+@@ -407,8 +411,8 @@ var BrowserCommands = {
        (event.ctrlKey || event.metaKey || event.altKey) &&
        gBrowser.selectedTab.pinned
      ) {

src/browser/components/urlbar/UrlbarInput-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 3ab07e5864b3bb200608e7f619645f92ade129fe..31085d82271b0259cd69ec9691ea5f33fe29e19e 100644
+index 50968dc04b527438acf30151f0c2e92f8b45097c..3053415e9df106c5d811e9fd597c05c51f83977b 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -16,7 +16,7 @@ index 3ab07e5864b3bb200608e7f619645f92ade129fe..31085d82271b0259cd69ec9691ea5f33
  const DEFAULT_FORM_HISTORY_NAME = "searchbar-history";
  const SEARCH_BUTTON_CLASS = "urlbar-search-button";
  
-@@ -2152,6 +2159,11 @@ export class UrlbarInput {
+@@ -2144,6 +2151,11 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
@@ -28,7 +28,27 @@ index 3ab07e5864b3bb200608e7f619645f92ade129fe..31085d82271b0259cd69ec9691ea5f33
      // Enable the animation only after the first extend call to ensure it
      // doesn't run when opening a new window.
      if (!this.hasAttribute("breakout-extend-animate")) {
-@@ -3875,6 +3887,11 @@ export class UrlbarInput {
+@@ -2163,6 +2175,10 @@ export class UrlbarInput {
+       return;
+     }
+ 
++    if (this._zenHandleUrlbarClose) {
++      this._zenHandleUrlbarClose();
++    }
++
+     this.removeAttribute("breakout-extend");
+     this.#updateTextboxPosition();
+   }
+@@ -3305,7 +3321,7 @@ export class UrlbarInput {
+     } else {
+       where = lazy.BrowserUtils.whereToOpenLink(event, false, false);
+     }
+-    if (lazy.UrlbarPrefs.get("openintab")) {
++    if (lazy.UrlbarPrefs.get("openintab") || this.hasAttribute("zen-newtab")) {
+       if (where == "current") {
+         where = "tab";
+       } else if (where == "tab") {
+@@ -3859,6 +3875,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -40,7 +60,16 @@ index 3ab07e5864b3bb200608e7f619645f92ade129fe..31085d82271b0259cd69ec9691ea5f33
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer ||
-@@ -3986,9 +4003,12 @@ export class UrlbarInput {
+@@ -3930,7 +3951,7 @@ export class UrlbarInput {
+       }
+     }
+ 
+-    if (this.focusedViaMousedown) {
++    if (this.focusedViaMousedown || this.hasAttribute("zen-newtab")) {
+       this.view.autoOpen({ event });
+     } else {
+       if (this._untrimOnFocusAfterKeydown) {
+@@ -3970,9 +3991,12 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -54,7 +83,7 @@ index 3ab07e5864b3bb200608e7f619645f92ade129fe..31085d82271b0259cd69ec9691ea5f33
  
          if (
            event.target != this.inputField &&
-@@ -3998,8 +4018,8 @@ export class UrlbarInput {
+@@ -3982,8 +4006,8 @@ export class UrlbarInput {
            break;
          }