From 4b4ada2e0ffbd2e916c780ba12a4ab38e67bcae5 Mon Sep 17 00:00:00 2001 From: Adrian Ordonez Date: Tue, 23 Sep 2025 22:27:30 -0700 Subject: [PATCH 01/10] feat: Add basic vim navigation to urlbar fix: patch --- .../browser/preferences/zen-preferences.ftl | 2 ++ prefs/zen-urlbar.yaml | 3 +++ .../components/preferences/zen-settings.js | 5 +++++ .../preferences/zenLooksAndFeel.inc.xhtml | 4 ++++ .../urlbar/UrlbarController-sys-mjs.patch | 21 +++++++++++++++++++ 5 files changed, 35 insertions(+) diff --git a/locales/en-US/browser/browser/preferences/zen-preferences.ftl b/locales/en-US/browser/browser/preferences/zen-preferences.ftl index 5ab322e344..5d546902e6 100644 --- a/locales/en-US/browser/browser/preferences/zen-preferences.ftl +++ b/locales/en-US/browser/browser/preferences/zen-preferences.ftl @@ -169,6 +169,8 @@ zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/prefs/zen-urlbar.yaml b/prefs/zen-urlbar.yaml index b9b0533d4f..fcefe8a1b1 100644 --- a/prefs/zen-urlbar.yaml +++ b/prefs/zen-urlbar.yaml @@ -11,6 +11,9 @@ - name: zen.urlbar.behavior value: floating-on-type +- name: zen.urlbar.vim-navigation.enabled + value: false + - name: zen.urlbar.wait-to-clear value: 45000 diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js index a93ba5b460..9f738c2045 100644 --- a/src/browser/components/preferences/zen-settings.js +++ b/src/browser/components/preferences/zen-settings.js @@ -1130,6 +1130,11 @@ Preferences.addAll([ type: 'string', default: 'float', }, + { + id: 'zen.urlbar.vim-navigation.enabled', + type: 'bool', + default: false, + }, { id: 'zen.workspaces.separate-essentials', type: 'bool', diff --git a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml index 6af7b0a5ca..9da7c045ab 100644 --- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml +++ b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml @@ -151,6 +151,10 @@ + + diff --git a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch index cd90f6116c..2dc63e2a6e 100644 --- a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch +++ b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch @@ -2,6 +2,27 @@ diff --git a/browser/components/urlbar/UrlbarController.sys.mjs b/browser/compon index 36e3ab4a5a153230bb488b66dda7e3e7c763ca23..81f2944b939ac0963c129f86aab0b55817349401 100644 --- a/browser/components/urlbar/UrlbarController.sys.mjs +++ b/browser/components/urlbar/UrlbarController.sys.mjs +@@ -302,6 +302,20 @@ export class UrlbarController { + return; + } + ++ // Handle vim navigation bindings. ++ if ( ++ Services.prefs.getBoolPref("zen.urlbar.vim-navigation.enabled", false) && ++ this.view.isOpen && ++ event.ctrlKey && ++ (event.key == "j" || event.key == "k") ++ ) { ++ if (executeAction) { ++ this.view.selectBy(1, { reverse: event.key == "k" }); ++ } ++ event.preventDefault(); ++ return; ++ } ++ + if (this.view.isOpen && executeAction && this._lastQueryContextWrapper) { + // In native inputs on most platforms, Shift+Up/Down moves the caret to the + // start/end of the input and changes its selection, so in that case defer @@ -434,6 +434,8 @@ export class UrlbarController { }); } From 382a38c20aafd2963a4834372e52b2e355cacd1d Mon Sep 17 00:00:00 2001 From: Adrian Ordonez Date: Wed, 24 Sep 2025 14:29:01 -0700 Subject: [PATCH 02/10] chore: add id to each locale --- locales/ar/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/ca/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/cs/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/cy/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/da/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/de/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/el/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/en-GB/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/es-ES/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/et/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/fa/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/fi/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/fr/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/ga-IE/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/he/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/hu/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/id/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/is/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/it/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/ja/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/ko/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/lt/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/nl/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/nn-NO/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/pl/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/pt-BR/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/pt-PT/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/ru/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/sv-SE/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/th/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/tr/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/uk/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/vi/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/zh-CN/browser/browser/preferences/zen-preferences.ftl | 2 ++ locales/zh-TW/browser/browser/preferences/zen-preferences.ftl | 2 ++ 35 files changed, 70 insertions(+) diff --git a/locales/ar/browser/browser/preferences/zen-preferences.ftl b/locales/ar/browser/browser/preferences/zen-preferences.ftl index 44b2b7635c..6cd11ead8e 100644 --- a/locales/ar/browser/browser/preferences/zen-preferences.ftl +++ b/locales/ar/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/ca/browser/browser/preferences/zen-preferences.ftl b/locales/ca/browser/browser/preferences/zen-preferences.ftl index b439a9e5ee..31df9e4d82 100644 --- a/locales/ca/browser/browser/preferences/zen-preferences.ftl +++ b/locales/ca/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Barra d'URL del Zen zen-urlbar-header = Configuració general de la barra d'URL zen-urlbar-description = Personalitzeu la barra d'URL al vostre gust zen-urlbar-behavior-label = Comportament +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/cs/browser/browser/preferences/zen-preferences.ftl b/locales/cs/browser/browser/preferences/zen-preferences.ftl index 2e710990da..e78c56c062 100644 --- a/locales/cs/browser/browser/preferences/zen-preferences.ftl +++ b/locales/cs/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen adresní řádek zen-urlbar-header = Obecné nastavení adresního řádku zen-urlbar-description = Přizpůsobte si adresní řádek podle svých představ zen-urlbar-behavior-label = Chování +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normální zen-urlbar-behavior-floating-on-type = diff --git a/locales/cy/browser/browser/preferences/zen-preferences.ftl b/locales/cy/browser/browser/preferences/zen-preferences.ftl index 081a37ecb2..09b12de473 100644 --- a/locales/cy/browser/browser/preferences/zen-preferences.ftl +++ b/locales/cy/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/da/browser/browser/preferences/zen-preferences.ftl b/locales/da/browser/browser/preferences/zen-preferences.ftl index ebb632dcb4..1076ec136d 100644 --- a/locales/da/browser/browser/preferences/zen-preferences.ftl +++ b/locales/da/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen URL-linje zen-urlbar-header = Generelle indstillinger for URL-linjen zen-urlbar-description = Tilpas URL-linjen til din smag zen-urlbar-behavior-label = Adfærd +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/de/browser/browser/preferences/zen-preferences.ftl b/locales/de/browser/browser/preferences/zen-preferences.ftl index cc8ded5183..749481adcc 100644 --- a/locales/de/browser/browser/preferences/zen-preferences.ftl +++ b/locales/de/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen Adressleiste zen-urlbar-header = Allgemeine Einstellungen für die Adressleiste zen-urlbar-description = Passen Sie die Adressleiste nach Ihren Wünschen an zen-urlbar-behavior-label = Verhalten +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/el/browser/browser/preferences/zen-preferences.ftl b/locales/el/browser/browser/preferences/zen-preferences.ftl index 4cd0d53c6d..3864bfeece 100644 --- a/locales/el/browser/browser/preferences/zen-preferences.ftl +++ b/locales/el/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Γραμμή Zen URL zen-urlbar-header = Γενικές ρυθμίσεις για τη γραμμή URL zen-urlbar-description = Προσαρμόστε τη γραμμή URL σύμφωνα με τις προτιμήσεις σας zen-urlbar-behavior-label = Συμπεριφορά +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Κανονική zen-urlbar-behavior-floating-on-type = diff --git a/locales/en-GB/browser/browser/preferences/zen-preferences.ftl b/locales/en-GB/browser/browser/preferences/zen-preferences.ftl index 574d51624a..f72c231285 100644 --- a/locales/en-GB/browser/browser/preferences/zen-preferences.ftl +++ b/locales/en-GB/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behaviour +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/es-ES/browser/browser/preferences/zen-preferences.ftl b/locales/es-ES/browser/browser/preferences/zen-preferences.ftl index be10c1d3a0..3c80e15a35 100644 --- a/locales/es-ES/browser/browser/preferences/zen-preferences.ftl +++ b/locales/es-ES/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Barra de direcciones de Zen zen-urlbar-header = Ajustes generales de la barra de direcciones zen-urlbar-description = Personalice la barra de direcciones a su gusto zen-urlbar-behavior-label = Comportamiento +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/et/browser/browser/preferences/zen-preferences.ftl b/locales/et/browser/browser/preferences/zen-preferences.ftl index 4cd455e747..8187d3ebc6 100644 --- a/locales/et/browser/browser/preferences/zen-preferences.ftl +++ b/locales/et/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen-i asukohariba zen-urlbar-header = Üldised asukohariba sätted zen-urlbar-description = Kohanda asukohariba endale meelepäraseks zen-urlbar-behavior-label = Käitumine +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Tavapärane zen-urlbar-behavior-floating-on-type = diff --git a/locales/fa/browser/browser/preferences/zen-preferences.ftl b/locales/fa/browser/browser/preferences/zen-preferences.ftl index 876f14a1ef..7062c09f80 100644 --- a/locales/fa/browser/browser/preferences/zen-preferences.ftl +++ b/locales/fa/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/fi/browser/browser/preferences/zen-preferences.ftl b/locales/fi/browser/browser/preferences/zen-preferences.ftl index 41c23f3dd1..c74fd41982 100644 --- a/locales/fi/browser/browser/preferences/zen-preferences.ftl +++ b/locales/fi/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/fr/browser/browser/preferences/zen-preferences.ftl b/locales/fr/browser/browser/preferences/zen-preferences.ftl index 66e352dcfa..4361828b24 100644 --- a/locales/fr/browser/browser/preferences/zen-preferences.ftl +++ b/locales/fr/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Barre d'adresse de Zen zen-urlbar-header = Paramètres généraux de la barre d’adresse zen-urlbar-description = Personnaliser la barre d'adresse selon vos préférences zen-urlbar-behavior-label = Comportement +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl b/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl index 6f7639c99f..7008456a69 100644 --- a/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl +++ b/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Barra URL Zen zen-urlbar-header = Socruithe ginearálta don bharra URL zen-urlbar-description = Saincheap an barra URL de réir mar is mian leat zen-urlbar-behavior-label = Iompraíocht +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Gnáth zen-urlbar-behavior-floating-on-type = diff --git a/locales/he/browser/browser/preferences/zen-preferences.ftl b/locales/he/browser/browser/preferences/zen-preferences.ftl index 02e60d27ca..169080828a 100644 --- a/locales/he/browser/browser/preferences/zen-preferences.ftl +++ b/locales/he/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = סרגל כתובת של Zen zen-urlbar-header = הגדרות כלליות לסרגל הכתובת החדש zen-urlbar-description = אפשר לשנות את סרגל הכתובת לטעמך zen-urlbar-behavior-label = התנהגות +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = רגיל zen-urlbar-behavior-floating-on-type = diff --git a/locales/hu/browser/browser/preferences/zen-preferences.ftl b/locales/hu/browser/browser/preferences/zen-preferences.ftl index a889eb1533..dae2f67342 100644 --- a/locales/hu/browser/browser/preferences/zen-preferences.ftl +++ b/locales/hu/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen URL sáv zen-urlbar-header = URL sáv általános beállításai zen-urlbar-description = Az URL sáv testreszabása a saját ízlése szerint zen-urlbar-behavior-label = Viselkedés +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normális zen-urlbar-behavior-floating-on-type = diff --git a/locales/id/browser/browser/preferences/zen-preferences.ftl b/locales/id/browser/browser/preferences/zen-preferences.ftl index fa3f074479..2f19574eb4 100644 --- a/locales/id/browser/browser/preferences/zen-preferences.ftl +++ b/locales/id/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Bilah URL Zen zen-urlbar-header = Pengaturan umum untuk bilah URL zen-urlbar-description = Sesuaikan bilah URL sesuai keinginan Anda zen-urlbar-behavior-label = Perilaku +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/is/browser/browser/preferences/zen-preferences.ftl b/locales/is/browser/browser/preferences/zen-preferences.ftl index 5874e3d6cb..b00eec24ac 100644 --- a/locales/is/browser/browser/preferences/zen-preferences.ftl +++ b/locales/is/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/it/browser/browser/preferences/zen-preferences.ftl b/locales/it/browser/browser/preferences/zen-preferences.ftl index 1bd514e524..dee0b30755 100644 --- a/locales/it/browser/browser/preferences/zen-preferences.ftl +++ b/locales/it/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Barra degli indirizzi di Zen zen-urlbar-header = Impostazioni generali per la barra degli indirizzi zen-urlbar-description = Personalizza la barra degli indirizzi a tuo piacimento zen-urlbar-behavior-label = Comportamento +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normale zen-urlbar-behavior-floating-on-type = diff --git a/locales/ja/browser/browser/preferences/zen-preferences.ftl b/locales/ja/browser/browser/preferences/zen-preferences.ftl index 2c723bae56..09a45f7187 100644 --- a/locales/ja/browser/browser/preferences/zen-preferences.ftl +++ b/locales/ja/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = URLバーの一般設定 zen-urlbar-description = 好みに合わせてURLバーをカスタマイズ zen-urlbar-behavior-label = 動作 +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = 通常 zen-urlbar-behavior-floating-on-type = diff --git a/locales/ko/browser/browser/preferences/zen-preferences.ftl b/locales/ko/browser/browser/preferences/zen-preferences.ftl index 616808c450..48574acb8f 100644 --- a/locales/ko/browser/browser/preferences/zen-preferences.ftl +++ b/locales/ko/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen 주소 표시줄 zen-urlbar-header = 주소 표시줄 일반 설정 zen-urlbar-description = 주소 표시줄을 취향껏 커스터마이징하세요 zen-urlbar-behavior-label = 작동 +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = 일반 zen-urlbar-behavior-floating-on-type = diff --git a/locales/lt/browser/browser/preferences/zen-preferences.ftl b/locales/lt/browser/browser/preferences/zen-preferences.ftl index b6a8bb193c..f3dfd593d1 100644 --- a/locales/lt/browser/browser/preferences/zen-preferences.ftl +++ b/locales/lt/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = „Zen“ URL juosta zen-urlbar-header = Bendrieji URL juostos nustatymai zen-urlbar-description = Tinkinkite URL juostą pagal savo poreikius. zen-urlbar-behavior-label = Elgsena +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Įprasta zen-urlbar-behavior-floating-on-type = diff --git a/locales/nl/browser/browser/preferences/zen-preferences.ftl b/locales/nl/browser/browser/preferences/zen-preferences.ftl index 65451d9cf0..faa9ce73e2 100644 --- a/locales/nl/browser/browser/preferences/zen-preferences.ftl +++ b/locales/nl/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen URL-balk zen-urlbar-header = Algemene instellingen voor de URL-balk zen-urlbar-description = Pas de URL-balk aan naar jouw voorkeur zen-urlbar-behavior-label = Gedrag +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normaal zen-urlbar-behavior-floating-on-type = diff --git a/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl b/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl index 84eccbcd31..672c6ac7af 100644 --- a/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl +++ b/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/pl/browser/browser/preferences/zen-preferences.ftl b/locales/pl/browser/browser/preferences/zen-preferences.ftl index c48814b1c0..b4b820e5b2 100644 --- a/locales/pl/browser/browser/preferences/zen-preferences.ftl +++ b/locales/pl/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Pasek adresu Zen zen-urlbar-header = Ogólne ustawienia dla paska adresu zen-urlbar-description = Zmodyfikuj pasek adresu zgodnie z preferencjami zen-urlbar-behavior-label = Zachowanie +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normalne zen-urlbar-behavior-floating-on-type = diff --git a/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl b/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl index 10fca566b1..5c809994f6 100644 --- a/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl +++ b/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Barra de Endereço do Zen zen-urlbar-header = Ajustes gerais da barra de endereços zen-urlbar-description = Personalize a barra de endereços do seu jeito zen-urlbar-behavior-label = Funcionamento +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Padrão zen-urlbar-behavior-floating-on-type = diff --git a/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl b/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl index acc8637ea9..3857f087bc 100644 --- a/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl +++ b/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Barra de URL Zen zen-urlbar-header = Configurações gerais para a barra de URL zen-urlbar-description = Personalize a barra de URL ao seu gosto zen-urlbar-behavior-label = Comportamento +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/ru/browser/browser/preferences/zen-preferences.ftl b/locales/ru/browser/browser/preferences/zen-preferences.ftl index c32b2b44a0..55e08d5966 100644 --- a/locales/ru/browser/browser/preferences/zen-preferences.ftl +++ b/locales/ru/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Поле адреса Zen zen-urlbar-header = Общие настройки поля адреса zen-urlbar-description = Настройте поле адреса на свой лад zen-urlbar-behavior-label = Поведение +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Обычное zen-urlbar-behavior-floating-on-type = diff --git a/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl b/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl index 01c75fcd1f..b52f1198b0 100644 --- a/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl +++ b/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/th/browser/browser/preferences/zen-preferences.ftl b/locales/th/browser/browser/preferences/zen-preferences.ftl index 84eccbcd31..672c6ac7af 100644 --- a/locales/th/browser/browser/preferences/zen-preferences.ftl +++ b/locales/th/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/tr/browser/browser/preferences/zen-preferences.ftl b/locales/tr/browser/browser/preferences/zen-preferences.ftl index f21b5c4288..f5434da402 100644 --- a/locales/tr/browser/browser/preferences/zen-preferences.ftl +++ b/locales/tr/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen URL Çubuğu zen-urlbar-header = URL çubuğu için genel ayarlar zen-urlbar-description = URL çubuğunu kendinize göre özelleştirin zen-urlbar-behavior-label = Davranış +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/uk/browser/browser/preferences/zen-preferences.ftl b/locales/uk/browser/browser/preferences/zen-preferences.ftl index dd5d54edcc..a043512a65 100644 --- a/locales/uk/browser/browser/preferences/zen-preferences.ftl +++ b/locales/uk/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Рядок URL-адрес Zen zen-urlbar-header = Загальні налаштування рядка URL-адрес zen-urlbar-description = Налаштуйте рядок URL-адрес на свій смак zen-urlbar-behavior-label = Поведінка +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Звичайний zen-urlbar-behavior-floating-on-type = diff --git a/locales/vi/browser/browser/preferences/zen-preferences.ftl b/locales/vi/browser/browser/preferences/zen-preferences.ftl index a0aae02fcf..4e3e251b0b 100644 --- a/locales/vi/browser/browser/preferences/zen-preferences.ftl +++ b/locales/vi/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Thanh đường dẫn zen-urlbar-header = Thiết lập chung cho thanh đường dẫn zen-urlbar-description = Tùy chỉnh thanh đường dẫn theo sở thích zen-urlbar-behavior-label = Hành vi thanh đường dẫn +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = Bình thường zen-urlbar-behavior-floating-on-type = diff --git a/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl b/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl index e73f05a039..29ff811cbd 100644 --- a/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl +++ b/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen 地址栏 zen-urlbar-header = 地址栏的常规设置 zen-urlbar-description = 自定义您喜欢的地址栏 zen-urlbar-behavior-label = 行为 +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = 默认 zen-urlbar-behavior-floating-on-type = diff --git a/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl b/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl index a82e95d1a2..4bd31583a7 100644 --- a/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl +++ b/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl @@ -140,6 +140,8 @@ zen-urlbar-title = Zen 網址欄 zen-urlbar-header = 網址列一般設定 zen-urlbar-description = 自訂義您喜歡的網址列 zen-urlbar-behavior-label = 行為 +zen-urlbar-vim-navigation = + .label = Vim Navigation zen-urlbar-behavior-normal = .label = 預設 zen-urlbar-behavior-floating-on-type = From affbd8635318b85808576c6416f82e9744f2c0d7 Mon Sep 17 00:00:00 2001 From: Adrian Ordonez Date: Wed, 24 Sep 2025 18:54:15 -0700 Subject: [PATCH 03/10] test: add for urlbar vim navigation --- src/zen/tests/urlbar/browser.toml | 1 + .../tests/urlbar/browser_vim_navigation.js | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 src/zen/tests/urlbar/browser_vim_navigation.js diff --git a/src/zen/tests/urlbar/browser.toml b/src/zen/tests/urlbar/browser.toml index c451b796e7..9236a1483f 100644 --- a/src/zen/tests/urlbar/browser.toml +++ b/src/zen/tests/urlbar/browser.toml @@ -10,3 +10,4 @@ support-files = [ ["browser_floating_urlbar.js"] ["browser_issue_7385.js"] +["browser_vim_navigation.js"] diff --git a/src/zen/tests/urlbar/browser_vim_navigation.js b/src/zen/tests/urlbar/browser_vim_navigation.js new file mode 100644 index 0000000000..c851650169 --- /dev/null +++ b/src/zen/tests/urlbar/browser_vim_navigation.js @@ -0,0 +1,39 @@ +/* Any copyright is dedicated to the Public Domain. + https://creativecommons.org/publicdomain/zero/1.0/ */ + +'use strict'; + +ChromeUtils.defineESModuleGetters(this, { + UrlbarTestUtils: 'resource://testing-common/UrlbarTestUtils.sys.mjs', +}); + +add_task(async function test_Vim_Navigation() { + gURLBar.blur(); + + await SpecialPowers.pushPrefEnv({ + set: [['zen.urlbar.vim-navigation.enabled', true]] + }); + + await SimpleTest.promiseFocus(window); + document.getElementById('Browser:OpenLocation').doCommand(); + await UrlbarTestUtils.promiseAutocompleteResultPopup({ + window, + waitForFocus: SimpleTest.waitForFocus, + // This value yields several results in the urlbar + value: 'a', + }); + + // Ctrl+j and down should work to move the selection down + EventUtils.synthesizeKey('j', { ctrlKey: true }, window); + // Move down one more time so the next assertion doesn't land on the start + EventUtils.synthesizeKey('j', { ctrlKey: true }, window); + EventUtils.synthesizeKey('VK_DOWN', {}, window); + + ok(UrlbarTestUtils.getSelectedRowIndex(window) == 3, 'Ctrl+j and down should change the selection'); + + + // Ctrl+k and up should work to move the selection up + EventUtils.synthesizeKey('k', { ctrlKey: true }, window); + EventUtils.synthesizeKey('VK_UP', {}, window); + ok(UrlbarTestUtils.getSelectedRowIndex(window) == 1, 'Ctrl+k and up should change the selection'); +}); From 19e0f1a5a5bc90ea985dfc7dea026d809d491ccc Mon Sep 17 00:00:00 2001 From: Adrian Ordonez Date: Wed, 24 Sep 2025 18:57:04 -0700 Subject: [PATCH 04/10] chore: npm run lint:fix --- src/zen/tests/urlbar/browser_vim_navigation.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/zen/tests/urlbar/browser_vim_navigation.js b/src/zen/tests/urlbar/browser_vim_navigation.js index c851650169..38f75e473a 100644 --- a/src/zen/tests/urlbar/browser_vim_navigation.js +++ b/src/zen/tests/urlbar/browser_vim_navigation.js @@ -11,7 +11,7 @@ add_task(async function test_Vim_Navigation() { gURLBar.blur(); await SpecialPowers.pushPrefEnv({ - set: [['zen.urlbar.vim-navigation.enabled', true]] + set: [['zen.urlbar.vim-navigation.enabled', true]], }); await SimpleTest.promiseFocus(window); @@ -29,8 +29,10 @@ add_task(async function test_Vim_Navigation() { EventUtils.synthesizeKey('j', { ctrlKey: true }, window); EventUtils.synthesizeKey('VK_DOWN', {}, window); - ok(UrlbarTestUtils.getSelectedRowIndex(window) == 3, 'Ctrl+j and down should change the selection'); - + ok( + UrlbarTestUtils.getSelectedRowIndex(window) == 3, + 'Ctrl+j and down should change the selection' + ); // Ctrl+k and up should work to move the selection up EventUtils.synthesizeKey('k', { ctrlKey: true }, window); From 9d17cd9cda026bfc17b32292d06e5e9c49d4eee1 Mon Sep 17 00:00:00 2001 From: Adrian Ordonez Date: Mon, 29 Sep 2025 10:29:44 -0600 Subject: [PATCH 05/10] Revert "chore: add id to each locale" This reverts commit 382a38c20aafd2963a4834372e52b2e355cacd1d. --- locales/ar/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/ca/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/cs/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/cy/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/da/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/de/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/el/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/en-GB/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/es-ES/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/et/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/fa/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/fi/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/fr/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/ga-IE/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/he/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/hu/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/id/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/is/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/it/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/ja/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/ko/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/lt/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/nl/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/nn-NO/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/pl/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/pt-BR/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/pt-PT/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/ru/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/sv-SE/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/th/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/tr/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/uk/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/vi/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/zh-CN/browser/browser/preferences/zen-preferences.ftl | 2 -- locales/zh-TW/browser/browser/preferences/zen-preferences.ftl | 2 -- 35 files changed, 70 deletions(-) diff --git a/locales/ar/browser/browser/preferences/zen-preferences.ftl b/locales/ar/browser/browser/preferences/zen-preferences.ftl index 6cd11ead8e..44b2b7635c 100644 --- a/locales/ar/browser/browser/preferences/zen-preferences.ftl +++ b/locales/ar/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/ca/browser/browser/preferences/zen-preferences.ftl b/locales/ca/browser/browser/preferences/zen-preferences.ftl index 31df9e4d82..b439a9e5ee 100644 --- a/locales/ca/browser/browser/preferences/zen-preferences.ftl +++ b/locales/ca/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Barra d'URL del Zen zen-urlbar-header = Configuració general de la barra d'URL zen-urlbar-description = Personalitzeu la barra d'URL al vostre gust zen-urlbar-behavior-label = Comportament -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/cs/browser/browser/preferences/zen-preferences.ftl b/locales/cs/browser/browser/preferences/zen-preferences.ftl index e78c56c062..2e710990da 100644 --- a/locales/cs/browser/browser/preferences/zen-preferences.ftl +++ b/locales/cs/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen adresní řádek zen-urlbar-header = Obecné nastavení adresního řádku zen-urlbar-description = Přizpůsobte si adresní řádek podle svých představ zen-urlbar-behavior-label = Chování -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normální zen-urlbar-behavior-floating-on-type = diff --git a/locales/cy/browser/browser/preferences/zen-preferences.ftl b/locales/cy/browser/browser/preferences/zen-preferences.ftl index 09b12de473..081a37ecb2 100644 --- a/locales/cy/browser/browser/preferences/zen-preferences.ftl +++ b/locales/cy/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/da/browser/browser/preferences/zen-preferences.ftl b/locales/da/browser/browser/preferences/zen-preferences.ftl index 1076ec136d..ebb632dcb4 100644 --- a/locales/da/browser/browser/preferences/zen-preferences.ftl +++ b/locales/da/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen URL-linje zen-urlbar-header = Generelle indstillinger for URL-linjen zen-urlbar-description = Tilpas URL-linjen til din smag zen-urlbar-behavior-label = Adfærd -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/de/browser/browser/preferences/zen-preferences.ftl b/locales/de/browser/browser/preferences/zen-preferences.ftl index 749481adcc..cc8ded5183 100644 --- a/locales/de/browser/browser/preferences/zen-preferences.ftl +++ b/locales/de/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen Adressleiste zen-urlbar-header = Allgemeine Einstellungen für die Adressleiste zen-urlbar-description = Passen Sie die Adressleiste nach Ihren Wünschen an zen-urlbar-behavior-label = Verhalten -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/el/browser/browser/preferences/zen-preferences.ftl b/locales/el/browser/browser/preferences/zen-preferences.ftl index 3864bfeece..4cd0d53c6d 100644 --- a/locales/el/browser/browser/preferences/zen-preferences.ftl +++ b/locales/el/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Γραμμή Zen URL zen-urlbar-header = Γενικές ρυθμίσεις για τη γραμμή URL zen-urlbar-description = Προσαρμόστε τη γραμμή URL σύμφωνα με τις προτιμήσεις σας zen-urlbar-behavior-label = Συμπεριφορά -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Κανονική zen-urlbar-behavior-floating-on-type = diff --git a/locales/en-GB/browser/browser/preferences/zen-preferences.ftl b/locales/en-GB/browser/browser/preferences/zen-preferences.ftl index f72c231285..574d51624a 100644 --- a/locales/en-GB/browser/browser/preferences/zen-preferences.ftl +++ b/locales/en-GB/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behaviour -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/es-ES/browser/browser/preferences/zen-preferences.ftl b/locales/es-ES/browser/browser/preferences/zen-preferences.ftl index 3c80e15a35..be10c1d3a0 100644 --- a/locales/es-ES/browser/browser/preferences/zen-preferences.ftl +++ b/locales/es-ES/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Barra de direcciones de Zen zen-urlbar-header = Ajustes generales de la barra de direcciones zen-urlbar-description = Personalice la barra de direcciones a su gusto zen-urlbar-behavior-label = Comportamiento -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/et/browser/browser/preferences/zen-preferences.ftl b/locales/et/browser/browser/preferences/zen-preferences.ftl index 8187d3ebc6..4cd455e747 100644 --- a/locales/et/browser/browser/preferences/zen-preferences.ftl +++ b/locales/et/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen-i asukohariba zen-urlbar-header = Üldised asukohariba sätted zen-urlbar-description = Kohanda asukohariba endale meelepäraseks zen-urlbar-behavior-label = Käitumine -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Tavapärane zen-urlbar-behavior-floating-on-type = diff --git a/locales/fa/browser/browser/preferences/zen-preferences.ftl b/locales/fa/browser/browser/preferences/zen-preferences.ftl index 7062c09f80..876f14a1ef 100644 --- a/locales/fa/browser/browser/preferences/zen-preferences.ftl +++ b/locales/fa/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/fi/browser/browser/preferences/zen-preferences.ftl b/locales/fi/browser/browser/preferences/zen-preferences.ftl index c74fd41982..41c23f3dd1 100644 --- a/locales/fi/browser/browser/preferences/zen-preferences.ftl +++ b/locales/fi/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/fr/browser/browser/preferences/zen-preferences.ftl b/locales/fr/browser/browser/preferences/zen-preferences.ftl index 4361828b24..66e352dcfa 100644 --- a/locales/fr/browser/browser/preferences/zen-preferences.ftl +++ b/locales/fr/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Barre d'adresse de Zen zen-urlbar-header = Paramètres généraux de la barre d’adresse zen-urlbar-description = Personnaliser la barre d'adresse selon vos préférences zen-urlbar-behavior-label = Comportement -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl b/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl index 7008456a69..6f7639c99f 100644 --- a/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl +++ b/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Barra URL Zen zen-urlbar-header = Socruithe ginearálta don bharra URL zen-urlbar-description = Saincheap an barra URL de réir mar is mian leat zen-urlbar-behavior-label = Iompraíocht -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Gnáth zen-urlbar-behavior-floating-on-type = diff --git a/locales/he/browser/browser/preferences/zen-preferences.ftl b/locales/he/browser/browser/preferences/zen-preferences.ftl index 169080828a..02e60d27ca 100644 --- a/locales/he/browser/browser/preferences/zen-preferences.ftl +++ b/locales/he/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = סרגל כתובת של Zen zen-urlbar-header = הגדרות כלליות לסרגל הכתובת החדש zen-urlbar-description = אפשר לשנות את סרגל הכתובת לטעמך zen-urlbar-behavior-label = התנהגות -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = רגיל zen-urlbar-behavior-floating-on-type = diff --git a/locales/hu/browser/browser/preferences/zen-preferences.ftl b/locales/hu/browser/browser/preferences/zen-preferences.ftl index dae2f67342..a889eb1533 100644 --- a/locales/hu/browser/browser/preferences/zen-preferences.ftl +++ b/locales/hu/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen URL sáv zen-urlbar-header = URL sáv általános beállításai zen-urlbar-description = Az URL sáv testreszabása a saját ízlése szerint zen-urlbar-behavior-label = Viselkedés -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normális zen-urlbar-behavior-floating-on-type = diff --git a/locales/id/browser/browser/preferences/zen-preferences.ftl b/locales/id/browser/browser/preferences/zen-preferences.ftl index 2f19574eb4..fa3f074479 100644 --- a/locales/id/browser/browser/preferences/zen-preferences.ftl +++ b/locales/id/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Bilah URL Zen zen-urlbar-header = Pengaturan umum untuk bilah URL zen-urlbar-description = Sesuaikan bilah URL sesuai keinginan Anda zen-urlbar-behavior-label = Perilaku -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/is/browser/browser/preferences/zen-preferences.ftl b/locales/is/browser/browser/preferences/zen-preferences.ftl index b00eec24ac..5874e3d6cb 100644 --- a/locales/is/browser/browser/preferences/zen-preferences.ftl +++ b/locales/is/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/it/browser/browser/preferences/zen-preferences.ftl b/locales/it/browser/browser/preferences/zen-preferences.ftl index dee0b30755..1bd514e524 100644 --- a/locales/it/browser/browser/preferences/zen-preferences.ftl +++ b/locales/it/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Barra degli indirizzi di Zen zen-urlbar-header = Impostazioni generali per la barra degli indirizzi zen-urlbar-description = Personalizza la barra degli indirizzi a tuo piacimento zen-urlbar-behavior-label = Comportamento -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normale zen-urlbar-behavior-floating-on-type = diff --git a/locales/ja/browser/browser/preferences/zen-preferences.ftl b/locales/ja/browser/browser/preferences/zen-preferences.ftl index 09a45f7187..2c723bae56 100644 --- a/locales/ja/browser/browser/preferences/zen-preferences.ftl +++ b/locales/ja/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = URLバーの一般設定 zen-urlbar-description = 好みに合わせてURLバーをカスタマイズ zen-urlbar-behavior-label = 動作 -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = 通常 zen-urlbar-behavior-floating-on-type = diff --git a/locales/ko/browser/browser/preferences/zen-preferences.ftl b/locales/ko/browser/browser/preferences/zen-preferences.ftl index 48574acb8f..616808c450 100644 --- a/locales/ko/browser/browser/preferences/zen-preferences.ftl +++ b/locales/ko/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen 주소 표시줄 zen-urlbar-header = 주소 표시줄 일반 설정 zen-urlbar-description = 주소 표시줄을 취향껏 커스터마이징하세요 zen-urlbar-behavior-label = 작동 -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = 일반 zen-urlbar-behavior-floating-on-type = diff --git a/locales/lt/browser/browser/preferences/zen-preferences.ftl b/locales/lt/browser/browser/preferences/zen-preferences.ftl index f3dfd593d1..b6a8bb193c 100644 --- a/locales/lt/browser/browser/preferences/zen-preferences.ftl +++ b/locales/lt/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = „Zen“ URL juosta zen-urlbar-header = Bendrieji URL juostos nustatymai zen-urlbar-description = Tinkinkite URL juostą pagal savo poreikius. zen-urlbar-behavior-label = Elgsena -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Įprasta zen-urlbar-behavior-floating-on-type = diff --git a/locales/nl/browser/browser/preferences/zen-preferences.ftl b/locales/nl/browser/browser/preferences/zen-preferences.ftl index faa9ce73e2..65451d9cf0 100644 --- a/locales/nl/browser/browser/preferences/zen-preferences.ftl +++ b/locales/nl/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen URL-balk zen-urlbar-header = Algemene instellingen voor de URL-balk zen-urlbar-description = Pas de URL-balk aan naar jouw voorkeur zen-urlbar-behavior-label = Gedrag -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normaal zen-urlbar-behavior-floating-on-type = diff --git a/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl b/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl index 672c6ac7af..84eccbcd31 100644 --- a/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl +++ b/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/pl/browser/browser/preferences/zen-preferences.ftl b/locales/pl/browser/browser/preferences/zen-preferences.ftl index b4b820e5b2..c48814b1c0 100644 --- a/locales/pl/browser/browser/preferences/zen-preferences.ftl +++ b/locales/pl/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Pasek adresu Zen zen-urlbar-header = Ogólne ustawienia dla paska adresu zen-urlbar-description = Zmodyfikuj pasek adresu zgodnie z preferencjami zen-urlbar-behavior-label = Zachowanie -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normalne zen-urlbar-behavior-floating-on-type = diff --git a/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl b/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl index 5c809994f6..10fca566b1 100644 --- a/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl +++ b/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Barra de Endereço do Zen zen-urlbar-header = Ajustes gerais da barra de endereços zen-urlbar-description = Personalize a barra de endereços do seu jeito zen-urlbar-behavior-label = Funcionamento -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Padrão zen-urlbar-behavior-floating-on-type = diff --git a/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl b/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl index 3857f087bc..acc8637ea9 100644 --- a/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl +++ b/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Barra de URL Zen zen-urlbar-header = Configurações gerais para a barra de URL zen-urlbar-description = Personalize a barra de URL ao seu gosto zen-urlbar-behavior-label = Comportamento -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/ru/browser/browser/preferences/zen-preferences.ftl b/locales/ru/browser/browser/preferences/zen-preferences.ftl index 55e08d5966..c32b2b44a0 100644 --- a/locales/ru/browser/browser/preferences/zen-preferences.ftl +++ b/locales/ru/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Поле адреса Zen zen-urlbar-header = Общие настройки поля адреса zen-urlbar-description = Настройте поле адреса на свой лад zen-urlbar-behavior-label = Поведение -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Обычное zen-urlbar-behavior-floating-on-type = diff --git a/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl b/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl index b52f1198b0..01c75fcd1f 100644 --- a/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl +++ b/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/th/browser/browser/preferences/zen-preferences.ftl b/locales/th/browser/browser/preferences/zen-preferences.ftl index 672c6ac7af..84eccbcd31 100644 --- a/locales/th/browser/browser/preferences/zen-preferences.ftl +++ b/locales/th/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen URL Bar zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/tr/browser/browser/preferences/zen-preferences.ftl b/locales/tr/browser/browser/preferences/zen-preferences.ftl index f5434da402..f21b5c4288 100644 --- a/locales/tr/browser/browser/preferences/zen-preferences.ftl +++ b/locales/tr/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen URL Çubuğu zen-urlbar-header = URL çubuğu için genel ayarlar zen-urlbar-description = URL çubuğunu kendinize göre özelleştirin zen-urlbar-behavior-label = Davranış -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/locales/uk/browser/browser/preferences/zen-preferences.ftl b/locales/uk/browser/browser/preferences/zen-preferences.ftl index a043512a65..dd5d54edcc 100644 --- a/locales/uk/browser/browser/preferences/zen-preferences.ftl +++ b/locales/uk/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Рядок URL-адрес Zen zen-urlbar-header = Загальні налаштування рядка URL-адрес zen-urlbar-description = Налаштуйте рядок URL-адрес на свій смак zen-urlbar-behavior-label = Поведінка -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Звичайний zen-urlbar-behavior-floating-on-type = diff --git a/locales/vi/browser/browser/preferences/zen-preferences.ftl b/locales/vi/browser/browser/preferences/zen-preferences.ftl index 4e3e251b0b..a0aae02fcf 100644 --- a/locales/vi/browser/browser/preferences/zen-preferences.ftl +++ b/locales/vi/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Thanh đường dẫn zen-urlbar-header = Thiết lập chung cho thanh đường dẫn zen-urlbar-description = Tùy chỉnh thanh đường dẫn theo sở thích zen-urlbar-behavior-label = Hành vi thanh đường dẫn -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Bình thường zen-urlbar-behavior-floating-on-type = diff --git a/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl b/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl index 29ff811cbd..e73f05a039 100644 --- a/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl +++ b/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen 地址栏 zen-urlbar-header = 地址栏的常规设置 zen-urlbar-description = 自定义您喜欢的地址栏 zen-urlbar-behavior-label = 行为 -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = 默认 zen-urlbar-behavior-floating-on-type = diff --git a/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl b/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl index 4bd31583a7..a82e95d1a2 100644 --- a/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl +++ b/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl @@ -140,8 +140,6 @@ zen-urlbar-title = Zen 網址欄 zen-urlbar-header = 網址列一般設定 zen-urlbar-description = 自訂義您喜歡的網址列 zen-urlbar-behavior-label = 行為 -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = 預設 zen-urlbar-behavior-floating-on-type = From fc1aaa8ffb005f2caddefe7d3e7a430ddba07d5f Mon Sep 17 00:00:00 2001 From: Adrian Ordonez Date: Mon, 29 Sep 2025 10:30:39 -0600 Subject: [PATCH 06/10] refactor(zenLooksAndFeel): remove vim navigation option Will keep this in about:config but removing clutter from the Preferences page --- locales/en-US/browser/browser/preferences/zen-preferences.ftl | 4 +--- src/browser/components/preferences/zenLooksAndFeel.inc.xhtml | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/locales/en-US/browser/browser/preferences/zen-preferences.ftl b/locales/en-US/browser/browser/preferences/zen-preferences.ftl index 5d546902e6..a6d08046e9 100644 --- a/locales/en-US/browser/browser/preferences/zen-preferences.ftl +++ b/locales/en-US/browser/browser/preferences/zen-preferences.ftl @@ -146,7 +146,7 @@ zen-theme-marketplace-input-default-placeholder = .placeholder = Type something... pane-zen-marketplace-title = Zen Mods zen-themes-auto-update = - .label = Automatically update installed mods on startup + .label = Automatically update installed mods on startup zen-settings-workspaces-force-container-tabs-to-workspace = .label = Switch to workspace where container is set as default when opening container tabs @@ -169,8 +169,6 @@ zen-urlbar-header = General settings for the URL bar zen-urlbar-description = Customize the URL bar to your liking zen-urlbar-behavior-label = Behavior -zen-urlbar-vim-navigation = - .label = Vim Navigation zen-urlbar-behavior-normal = .label = Normal zen-urlbar-behavior-floating-on-type = diff --git a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml index 9da7c045ab..6af7b0a5ca 100644 --- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml +++ b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml @@ -151,10 +151,6 @@ - - From 35ee020bf5b14aba5b50f18c259540b4cb4c6fe9 Mon Sep 17 00:00:00 2001 From: Adrian Ordonez Date: Mon, 29 Sep 2025 10:36:11 -0600 Subject: [PATCH 07/10] test(browser_vim_navigation): add test for when the option is turned off --- .../tests/urlbar/browser_vim_navigation.js | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/src/zen/tests/urlbar/browser_vim_navigation.js b/src/zen/tests/urlbar/browser_vim_navigation.js index 38f75e473a..868f47b79c 100644 --- a/src/zen/tests/urlbar/browser_vim_navigation.js +++ b/src/zen/tests/urlbar/browser_vim_navigation.js @@ -7,7 +7,7 @@ ChromeUtils.defineESModuleGetters(this, { UrlbarTestUtils: 'resource://testing-common/UrlbarTestUtils.sys.mjs', }); -add_task(async function test_Vim_Navigation() { +add_task(async function test_Vim_Navigation_on() { gURLBar.blur(); await SpecialPowers.pushPrefEnv({ @@ -39,3 +39,36 @@ add_task(async function test_Vim_Navigation() { EventUtils.synthesizeKey('VK_UP', {}, window); ok(UrlbarTestUtils.getSelectedRowIndex(window) == 1, 'Ctrl+k and up should change the selection'); }); + +add_task(async function test_Vim_Navigation_off() { + gURLBar.blur(); + + await SpecialPowers.pushPrefEnv({ + set: [['zen.urlbar.vim-navigation.enabled', false]], + }); + + await SimpleTest.promiseFocus(window); + document.getElementById('Browser:OpenLocation').doCommand(); + await UrlbarTestUtils.promiseAutocompleteResultPopup({ + window, + waitForFocus: SimpleTest.waitForFocus, + // This value yields several results in the urlbar + value: 'a', + }); + + // Only down should work to move the selection down + EventUtils.synthesizeKey('j', { ctrlKey: true }, window); + EventUtils.synthesizeKey('j', { ctrlKey: true }, window); + EventUtils.synthesizeKey('VK_DOWN', {}, window); + EventUtils.synthesizeKey('VK_DOWN', {}, window); + + ok( + UrlbarTestUtils.getSelectedRowIndex(window) == 2, + 'Only down should change the selection' + ); + + // Only up should work to move the selection up + EventUtils.synthesizeKey('k', { ctrlKey: true }, window); + EventUtils.synthesizeKey('VK_UP', {}, window); + ok(UrlbarTestUtils.getSelectedRowIndex(window) == 1, 'Only up should change the selection'); +}); From e70511cf5e266d2d7ddf8531cd5400a115e9f79c Mon Sep 17 00:00:00 2001 From: Adrian Ordonez Date: Mon, 29 Sep 2025 10:37:48 -0600 Subject: [PATCH 08/10] chore(en-US/zen-preferences): cleanup change --- locales/en-US/browser/browser/preferences/zen-preferences.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en-US/browser/browser/preferences/zen-preferences.ftl b/locales/en-US/browser/browser/preferences/zen-preferences.ftl index a6d08046e9..5ab322e344 100644 --- a/locales/en-US/browser/browser/preferences/zen-preferences.ftl +++ b/locales/en-US/browser/browser/preferences/zen-preferences.ftl @@ -146,7 +146,7 @@ zen-theme-marketplace-input-default-placeholder = .placeholder = Type something... pane-zen-marketplace-title = Zen Mods zen-themes-auto-update = - .label = Automatically update installed mods on startup + .label = Automatically update installed mods on startup zen-settings-workspaces-force-container-tabs-to-workspace = .label = Switch to workspace where container is set as default when opening container tabs From c7d726da62124447bfc588f5a8389d0495d89c33 Mon Sep 17 00:00:00 2001 From: Adrian Ordonez Date: Sat, 4 Oct 2025 14:49:51 -0600 Subject: [PATCH 09/10] fix(UrlbarController-sys-mjs): move preference check under key event check --- src/browser/components/urlbar/UrlbarController-sys-mjs.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch index 7339ab3fe1..393a379b8c 100644 --- a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch +++ b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch @@ -8,10 +8,10 @@ index 36e3ab4a5a153230bb488b66dda7e3e7c763ca23..cc4ea61914a316451fa54b01a5c8c6a3 + // Handle vim navigation bindings. + if ( -+ Services.prefs.getBoolPref("zen.urlbar.vim-navigation.enabled", false) && + this.view.isOpen && + event.ctrlKey && -+ (event.key == "j" || event.key == "k") ++ (event.key == "j" || event.key == "k") && ++ Services.prefs.getBoolPref("zen.urlbar.vim-navigation.enabled", false) + ) { + if (executeAction) { + this.view.selectBy(1, { reverse: event.key == "k" }); From bf8546c9991b34aca3154e74bf87a8075bbdf730 Mon Sep 17 00:00:00 2001 From: Adrian Ordonez Date: Sat, 4 Oct 2025 21:04:15 -0600 Subject: [PATCH 10/10] chore(*): npm run lint --- src/zen/tests/urlbar/browser_vim_navigation.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/zen/tests/urlbar/browser_vim_navigation.js b/src/zen/tests/urlbar/browser_vim_navigation.js index 868f47b79c..a075535fb5 100644 --- a/src/zen/tests/urlbar/browser_vim_navigation.js +++ b/src/zen/tests/urlbar/browser_vim_navigation.js @@ -62,10 +62,7 @@ add_task(async function test_Vim_Navigation_off() { EventUtils.synthesizeKey('VK_DOWN', {}, window); EventUtils.synthesizeKey('VK_DOWN', {}, window); - ok( - UrlbarTestUtils.getSelectedRowIndex(window) == 2, - 'Only down should change the selection' - ); + ok(UrlbarTestUtils.getSelectedRowIndex(window) == 2, 'Only down should change the selection'); // Only up should work to move the selection up EventUtils.synthesizeKey('k', { ctrlKey: true }, window);