From 9176a65296a96e81383019540d6d3c9e8ee25fa5 Mon Sep 17 00:00:00 2001 From: Simon Lydell Date: Sat, 27 Jun 2015 00:32:52 +0200 Subject: [PATCH] Rename Insert mode into Ignore mode ... because that's what it is. Insert mode was a bit confusing since you could easily think that Insert mode was entered any time you focused a text input. See also #506. --- documentation/api.md | 2 +- extension/lib/commands.coffee | 6 ++--- extension/lib/defaults.coffee | 4 +-- extension/lib/migrations.coffee | 4 +-- extension/lib/modes.coffee | 2 +- extension/lib/vim.coffee | 4 +-- extension/locale/de/vimfx.properties | 8 +++--- extension/locale/el-GR/vimfx.properties | 8 +++--- extension/locale/en-US/vimfx.properties | 8 +++--- extension/locale/fr/vimfx.properties | 10 +++---- extension/locale/hu/vimfx.properties | 8 +++--- extension/locale/id/vimfx.properties | 8 +++--- extension/locale/it/vimfx.properties | 8 +++--- extension/locale/ja/vimfx.properties | 8 +++--- extension/locale/nl/vimfx.properties | 8 +++--- extension/locale/pl/vimfx.properties | 8 +++--- extension/locale/pt-BR/vimfx.properties | 6 ++--- extension/locale/ru/vimfx.properties | 8 +++--- extension/locale/sv-SE/vimfx.properties | 6 ++--- extension/locale/zh-CN/vimfx.properties | 8 +++--- extension/locale/zh-TW/vimfx.properties | 8 +++--- extension/skin/style.css | 2 +- extension/test/test-api.coffee | 36 ++++++++++++------------- 23 files changed, 89 insertions(+), 89 deletions(-) diff --git a/documentation/api.md b/documentation/api.md index 2103bf2..1ee83e0 100644 --- a/documentation/api.md +++ b/documentation/api.md @@ -188,7 +188,7 @@ be used to replace the blacklist option). ```js vimfx.on('load', ({vim, location}) => { if (location.hostname === 'example.com') { - vim.enterMode('insert') + vim.enterMode('ignore') } }) ``` diff --git a/extension/lib/commands.coffee b/extension/lib/commands.coffee index 9ab95ef..c64f01c 100644 --- a/extension/lib/commands.coffee +++ b/extension/lib/commands.coffee @@ -552,12 +552,12 @@ commands.find_previous = helper_find_again.bind(null, true) -commands.enter_mode_insert = ({ vim }) -> - vim.enterMode('insert') +commands.enter_mode_ignore = ({ vim }) -> + vim.enterMode('ignore') # Quote next keypress (pass it through to the page). commands.quote = ({ vim, count }) -> - vim.enterMode('insert', count ? 1) + vim.enterMode('ignore', count ? 1) # Display the Help Dialog. commands.help = ({ vim }) -> diff --git a/extension/lib/defaults.coffee b/extension/lib/defaults.coffee index b389f92..7b3ac8a 100644 --- a/extension/lib/defaults.coffee +++ b/extension/lib/defaults.coffee @@ -87,7 +87,7 @@ shortcuts = 'N': 'find_previous' 'misc': - 'i': 'enter_mode_insert' + 'i': 'enter_mode_ignore' 'I': 'quote' '?': 'help' ':': 'dev' @@ -100,7 +100,7 @@ shortcuts = '': 'rotate_markers_backward' '': 'delete_hint_char' - 'insert': + 'ignore': '': '': 'exit' diff --git a/extension/lib/migrations.coffee b/extension/lib/migrations.coffee index bbfb04e..916b0eb 100644 --- a/extension/lib/migrations.coffee +++ b/extension/lib/migrations.coffee @@ -83,13 +83,13 @@ migrations[0] = -> 'find_hl': 'normal.find_highlight_all' 'find_next': 'normal.find_next' 'find_prev': 'normal.find_previous' - 'insert_mode': 'normal.enter_mode_insert' + 'insert_mode': 'normal.enter_mode_ignore' 'quote': 'normal.quote' 'help': 'normal.help' 'dev': 'normal.dev' 'Esc': 'normal.esc' - 'mode_insert_exit': 'insert.exit' + 'mode_insert_exit': 'ignore.exit' 'mode_hints_exit': 'hints.exit' 'mode_hints_rotate_markers_forward': 'hints.rotate_markers_forward' diff --git a/extension/lib/modes.coffee b/extension/lib/modes.coffee index 26492d0..eda3e44 100644 --- a/extension/lib/modes.coffee +++ b/extension/lib/modes.coffee @@ -182,7 +182,7 @@ mode('hints', { -mode('insert', { +mode('ignore', { onEnter: ({ vim, storage, args: [ count ] }) -> storage.count = count ? null diff --git a/extension/lib/vim.coffee b/extension/lib/vim.coffee index 578e18b..a107946 100644 --- a/extension/lib/vim.coffee +++ b/extension/lib/vim.coffee @@ -34,9 +34,9 @@ class Vim lastFocusedTextInput: null if @isBlacklisted() - @enterMode('insert') + @enterMode('ignore') else - @enterMode('normal') if force or @mode == 'insert' + @enterMode('normal') if force or @mode == 'ignore' @parent.emit('load', {vim: this, location: @window.location}) diff --git a/extension/locale/de/vimfx.properties b/extension/locale/de/vimfx.properties index a9c5b26..9d438fb 100644 --- a/extension/locale/de/vimfx.properties +++ b/extension/locale/de/vimfx.properties @@ -73,7 +73,7 @@ mode.normal.find_next=Zur nächsten Übereinstimmung springen mode.normal.find_previous=Zur vorherigen Übereinstimmung springen category.misc=Verschiedenes -mode.normal.enter_mode_insert=Zum Eingabemodus wechseln: Alle Befehle ignorieren +mode.normal.enter_mode_ignore=Zum Ignorierenmodus wechseln: Alle Befehle ignorieren mode.normal.quote=Pass next keypress through to the page mode.normal.help=Hilfedialog anzeigen mode.normal.dev=Entwickler-Werkzeuge öffnen @@ -85,8 +85,8 @@ mode.hints.rotate_markers_forward=Rotate overlapping markers forward mode.hints.rotate_markers_backward=Rotate overlapping markers backward mode.hints.delete_hint_char=Delete last typed hint character -mode.insert=Insert Mode -mode.insert.exit=Return to normal mode +mode.ignore=Ignore Mode +mode.ignore.exit=Return to normal mode mode.find=Find Mode mode.find.exit=Close find bar @@ -95,7 +95,7 @@ pref.hint_chars.title=Zeichen für Hinweise pref.hint_chars.desc= pref.black_list.title=Schwarze Liste -pref.black_list.desc=URLs where VimFx should automatically enter Insert mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. +pref.black_list.desc=URLs where VimFx should automatically enter Ignore mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. pref.prev_patterns.title=Muster für die vorherige Seite pref.prev_patterns.desc= diff --git a/extension/locale/el-GR/vimfx.properties b/extension/locale/el-GR/vimfx.properties index 02d974d..d156307 100644 --- a/extension/locale/el-GR/vimfx.properties +++ b/extension/locale/el-GR/vimfx.properties @@ -73,7 +73,7 @@ mode.normal.find_next=Πήγαινε στην επόμενη ατιστοιχί mode.normal.find_previous=Πήγαινε στην προηγούμενη αντιστοιχία category.misc=Διάφορα -mode.normal.enter_mode_insert=Είσοδος σε λειτουργία εισαγωγής (insert mode): Αγνόησε όλες τις εντολές +mode.normal.enter_mode_ignore=Είσοδος σε λειτουργία εισαγωγής (ignore mode): Αγνόησε όλες τις εντολές mode.normal.quote=Pass next keypress through to the page mode.normal.help=Show the help dialog mode.normal.dev=Άνοιγμα Developer Toolbar @@ -85,8 +85,8 @@ mode.hints.rotate_markers_forward=Rotate overlapping markers forward mode.hints.rotate_markers_backward=Rotate overlapping markers backward mode.hints.delete_hint_char=Delete last typed hint character -mode.insert=Insert Mode -mode.insert.exit=Return to normal mode +mode.ignore=Ignore Mode +mode.ignore.exit=Return to normal mode mode.find=Find Mode mode.find.exit=Close find bar @@ -95,7 +95,7 @@ pref.hint_chars.title=Χαρακτήρες Δεικτών pref.hint_chars.desc= pref.black_list.title=Μαύρη Λίστα -pref.black_list.desc=URLs where VimFx should automatically enter Insert mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. +pref.black_list.desc=URLs where VimFx should automatically enter Ignore mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. pref.prev_patterns.title=Patterns Προηγούμενης Σελίδας pref.prev_patterns.desc= diff --git a/extension/locale/en-US/vimfx.properties b/extension/locale/en-US/vimfx.properties index 24d2a54..c1277d4 100644 --- a/extension/locale/en-US/vimfx.properties +++ b/extension/locale/en-US/vimfx.properties @@ -73,7 +73,7 @@ mode.normal.find_next=Find next mode.normal.find_previous=Find previous category.misc=Misc -mode.normal.enter_mode_insert=Enter Insert mode: Ignore all commands +mode.normal.enter_mode_ignore=Enter Ignore mode: Ignore all commands mode.normal.quote=Pass next keypress through to the page mode.normal.help=Show the help dialog mode.normal.dev=Open the Developer Toolbar @@ -85,8 +85,8 @@ mode.hints.rotate_markers_forward=Rotate overlapping markers forward mode.hints.rotate_markers_backward=Rotate overlapping markers backward mode.hints.delete_hint_char=Delete last typed hint character -mode.insert=Insert Mode -mode.insert.exit=Return to Normal mode +mode.ignore=Ignore Mode +mode.ignore.exit=Return to Normal mode mode.find=Find Mode mode.find.exit=Close find bar @@ -95,7 +95,7 @@ pref.hint_chars.title=Hint Chars pref.hint_chars.desc= pref.black_list.title=Blacklist -pref.black_list.desc=URLs where VimFx should automatically enter Insert mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. +pref.black_list.desc=URLs where VimFx should automatically enter Ignore mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. pref.prev_patterns.title=Previous Page Patterns pref.prev_patterns.desc= diff --git a/extension/locale/fr/vimfx.properties b/extension/locale/fr/vimfx.properties index c354d2c..5fc7653 100644 --- a/extension/locale/fr/vimfx.properties +++ b/extension/locale/fr/vimfx.properties @@ -73,11 +73,11 @@ mode.normal.find_next=Aller au résultat suivant mode.normal.find_previous=Aller au résultat précédent category.misc=Divers -mode.normal.enter_mode_insert=Enter en mode insertion: Ignorer toutes les commandes +mode.normal.enter_mode_ignore=Enter en mode Ignore: Ignorer toutes les commandes mode.normal.quote=Transmettre la prochaine pression de touche à la page mode.normal.help=Show the help dialog mode.normal.dev=Ouvrir la barre d'outils de développement -mode.normal.esc=Revenir en mode normal (supprimer le marqueurs, sortir du mode insertion) ou quitter l'élément actif +mode.normal.esc=Revenir en mode normal (supprimer le marqueurs, sortir du mode Ignore) ou quitter l'élément actif mode.hints=Mode de sélection de lien mode.hints.exit=Retourner au mode initial @@ -85,8 +85,8 @@ mode.hints.rotate_markers_forward=Faire tourner vers l'avant les marqueurs super mode.hints.rotate_markers_backward=Faire tourner en arrière mode.hints.delete_hint_char=Supprimer le dernier caractère frappé lors de la sélection d'un marqueur -mode.insert=Mode insertion -mode.insert.exit=Retourner au mode par défaut +mode.ignore=Mode ignore +mode.ignore.exit=Retourner au mode par défaut mode.find=Mode recherche mode.find.exit=Fermer la barre de recherche @@ -95,7 +95,7 @@ pref.hint_chars.title=Marqueurs de liens pref.hint_chars.desc= pref.black_list.title=Liste noire -pref.black_list.desc=URLs where VimFx should automatically enter Insert mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. +pref.black_list.desc=URLs where VimFx should automatically enter Ignore mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. pref.prev_patterns.title=Motifs des pages précédentes pref.prev_patterns.desc= diff --git a/extension/locale/hu/vimfx.properties b/extension/locale/hu/vimfx.properties index 3e67368..a53b106 100644 --- a/extension/locale/hu/vimfx.properties +++ b/extension/locale/hu/vimfx.properties @@ -73,7 +73,7 @@ mode.normal.find_next=Következő találatra ugrás mode.normal.find_previous=Előző találatra ugrás category.misc=Általános -mode.normal.enter_mode_insert=Enter insert mode: Ignore all commands +mode.normal.enter_mode_ignore=Enter Ignore mode: Ignore all commands mode.normal.quote=Pass next keypress through to the page mode.normal.help=Show the help dialog mode.normal.dev=Open Developer Toolbar @@ -85,8 +85,8 @@ mode.hints.rotate_markers_forward=Rotate overlapping markers forward mode.hints.rotate_markers_backward=Rotate overlapping markers backward mode.hints.delete_hint_char=Delete last typed hint character -mode.insert=Insert Mode -mode.insert.exit=Return to normal mode +mode.ignore=Ignore Mode +mode.ignore.exit=Return to normal mode mode.find=Find Mode mode.find.exit=Close find bar @@ -95,7 +95,7 @@ pref.hint_chars.title=Segéd karakterek pref.hint_chars.desc= pref.black_list.title=Fekete lista -pref.black_list.desc=URLs where VimFx should automatically enter Insert mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. +pref.black_list.desc=URLs where VimFx should automatically enter Ignore mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. pref.prev_patterns.title=Previous Page Patterns pref.prev_patterns.desc= diff --git a/extension/locale/id/vimfx.properties b/extension/locale/id/vimfx.properties index 505a451..06b4c0e 100644 --- a/extension/locale/id/vimfx.properties +++ b/extension/locale/id/vimfx.properties @@ -73,7 +73,7 @@ mode.normal.find_next=Menuju temuan cocok setelah mode.normal.find_previous=Menuju temuan cocok sebelum category.misc=Lain-lain -mode.normal.enter_mode_insert=Enter insert mode: Ignore all commands +mode.normal.enter_mode_ignore=Enter Ignore mode: Ignore all commands mode.normal.quote=Pass next keypress through to the page mode.normal.help=Show the help dialog mode.normal.dev=Buka Toolbar Pengembang @@ -85,8 +85,8 @@ mode.hints.rotate_markers_forward=Rotate overlapping markers forward mode.hints.rotate_markers_backward=Rotate overlapping markers backward mode.hints.delete_hint_char=Delete last typed hint character -mode.insert=Insert Mode -mode.insert.exit=Return to normal mode +mode.ignore=Ignore Mode +mode.ignore.exit=Return to normal mode mode.find=Find Mode mode.find.exit=Close find bar @@ -95,7 +95,7 @@ pref.hint_chars.title=Karakter petunjuk pref.hint_chars.desc= pref.black_list.title=Daftar Larangan -pref.black_list.desc=URLs where VimFx should automatically enter Insert mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. +pref.black_list.desc=URLs where VimFx should automatically enter Ignore mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. pref.prev_patterns.title=Previous Page Patterns pref.prev_patterns.desc= diff --git a/extension/locale/it/vimfx.properties b/extension/locale/it/vimfx.properties index 96e34f4..470933f 100644 --- a/extension/locale/it/vimfx.properties +++ b/extension/locale/it/vimfx.properties @@ -73,7 +73,7 @@ mode.normal.find_next=Vai al prossimo risultato della ricerca mode.normal.find_previous=Vai al precedente risultato della ricerca category.misc=Miscellanea -mode.normal.enter_mode_insert=Entra in modalità inserimento: ignora tutti i comandi +mode.normal.enter_mode_ignore=Entra in modalità Ignore: ignora tutti i comandi mode.normal.quote=Pass next keypress through to the page mode.normal.help=Show the help dialog mode.normal.dev=Apri la barra degli strumenti Sviluppatore @@ -85,8 +85,8 @@ mode.hints.rotate_markers_forward=Rotate overlapping markers forward mode.hints.rotate_markers_backward=Rotate overlapping markers backward mode.hints.delete_hint_char=Delete last typed hint character -mode.insert=Insert Mode -mode.insert.exit=Return to normal mode +mode.ignore=Ignore Mode +mode.ignore.exit=Return to normal mode mode.find=Find Mode mode.find.exit=Close find bar @@ -95,7 +95,7 @@ pref.hint_chars.title=Caratteri di suggerimento pref.hint_chars.desc= pref.black_list.title=Lista nera -pref.black_list.desc=URLs where VimFx should automatically enter Insert mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. +pref.black_list.desc=URLs where VimFx should automatically enter Ignore mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. pref.prev_patterns.title=Pattern pagina precedente pref.prev_patterns.desc= diff --git a/extension/locale/ja/vimfx.properties b/extension/locale/ja/vimfx.properties index d2f5544..a3ecd2a 100644 --- a/extension/locale/ja/vimfx.properties +++ b/extension/locale/ja/vimfx.properties @@ -73,7 +73,7 @@ mode.normal.find_next=次の一致部分へ移動 mode.normal.find_previous=前の一致部分へ移動 category.misc=その他 -mode.normal.enter_mode_insert=挿入モードへ入る：全てのコマンドを無視します +mode.normal.enter_mode_ignore=挿入モードへ入る：全てのコマンドを無視します mode.normal.quote=Pass next keypress through to the page mode.normal.help=Show the help dialog mode.normal.dev=開発者ツールバーを開く @@ -85,8 +85,8 @@ mode.hints.rotate_markers_forward=Rotate overlapping markers forward mode.hints.rotate_markers_backward=Rotate overlapping markers backward mode.hints.delete_hint_char=Delete last typed hint character -mode.insert=Insert Mode -mode.insert.exit=Return to normal mode +mode.ignore=Ignore Mode +mode.ignore.exit=Return to normal mode mode.find=Find Mode mode.find.exit=Close find bar @@ -95,7 +95,7 @@ pref.hint_chars.title=ヒント機能で使用する文字 pref.hint_chars.desc= pref.black_list.title=ブラックリスト -pref.black_list.desc=URLs where VimFx should automatically enter Insert mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. +pref.black_list.desc=URLs where VimFx should automatically enter Ignore mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. pref.prev_patterns.title=前のページへのリンクのパターン pref.prev_patterns.desc= diff --git a/extension/locale/nl/vimfx.properties b/extension/locale/nl/vimfx.properties index fe4c854..82640de 100644 --- a/extension/locale/nl/vimfx.properties +++ b/extension/locale/nl/vimfx.properties @@ -73,7 +73,7 @@ mode.normal.find_next=Ga naar volgende overeenkomst mode.normal.find_previous=Ga naar vorige overeenkomst category.misc=Trivia -mode.normal.enter_mode_insert=Enter insert mode: Ignore all commands +mode.normal.enter_mode_ignore=Enter Ignore mode: Ignore all commands mode.normal.quote=Pass next keypress through to the page mode.normal.help=Show the help dialog mode.normal.dev=Open ontwikkelaarswerkbalk @@ -85,8 +85,8 @@ mode.hints.rotate_markers_forward=Rotate overlapping markers forward mode.hints.rotate_markers_backward=Rotate overlapping markers backward mode.hints.delete_hint_char=Delete last typed hint character -mode.insert=Insert Mode -mode.insert.exit=Return to normal mode +mode.ignore=Ignore Mode +mode.ignore.exit=Return to normal mode mode.find=Find Mode mode.find.exit=Close find bar @@ -95,7 +95,7 @@ pref.hint_chars.title=Gebruikte karakters pref.hint_chars.desc= pref.black_list.title=Zwarte lijst -pref.black_list.desc=URLs where VimFx should automatically enter Insert mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. +pref.black_list.desc=URLs where VimFx should automatically enter Ignore mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. pref.prev_patterns.title=Previous Page Patterns pref.prev_patterns.desc= diff --git a/extension/locale/pl/vimfx.properties b/extension/locale/pl/vimfx.properties index bdced73..abda17d 100644 --- a/extension/locale/pl/vimfx.properties +++ b/extension/locale/pl/vimfx.properties @@ -73,7 +73,7 @@ mode.normal.find_next=Znajdź następne mode.normal.find_previous=Znajdź poprzednie category.misc=Różne -mode.normal.enter_mode_insert=Włącz insert mode: Ignoruj wszystkie komendy +mode.normal.enter_mode_ignore=Włącz Ignore mode: Ignoruj wszystkie komendy mode.normal.quote=Pass next keypress through to the page mode.normal.help=Show the help dialog mode.normal.dev=Otwórz pasek programisty @@ -85,8 +85,8 @@ mode.hints.rotate_markers_forward=Rotate overlapping markers forward mode.hints.rotate_markers_backward=Rotate overlapping markers backward mode.hints.delete_hint_char=Delete last typed hint character -mode.insert=Insert Mode -mode.insert.exit=Return to normal mode +mode.ignore=Ignore Mode +mode.ignore.exit=Return to normal mode mode.find=Find Mode mode.find.exit=Close find bar @@ -95,7 +95,7 @@ pref.hint_chars.title=Znaki podpowiedzi pref.hint_chars.desc= pref.black_list.title=Czarna lista -pref.black_list.desc=URLs where VimFx should automatically enter Insert mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. +pref.black_list.desc=URLs where VimFx should automatically enter Ignore mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. pref.prev_patterns.title=Poprzednia strona - wzorce pref.prev_patterns.desc= diff --git a/extension/locale/pt-BR/vimfx.properties b/extension/locale/pt-BR/vimfx.properties index 92f4511..b589356 100644 --- a/extension/locale/pt-BR/vimfx.properties +++ b/extension/locale/pt-BR/vimfx.properties @@ -73,7 +73,7 @@ mode.normal.find_next=Localizar próximo mode.normal.find_previous=Localizar anterior category.misc=Diversos -mode.normal.enter_mode_insert=Entrar no modo de Inserção: Ignorar todos os comandos +mode.normal.enter_mode_ignore=Entrar no modo de Ignore: Ignorar todos os comandos mode.normal.quote=Passar próximo keypress através da página mode.normal.help=Mostrar o diálogo de ajuda mode.normal.dev=Abrir a Barra de Ferramentas de Desenvolvedor @@ -85,8 +85,8 @@ mode.hints.rotate_markers_forward=Rotacionar marcadores sobrepostos para frente mode.hints.rotate_markers_backward=Rotacionar marcadores sobrepostos para trás mode.hints.delete_hint_char=Deletar o último caractere digitado da sugestão -mode.insert=Modo de Inserção -mode.insert.exit=Voltar ao modo Normal +mode.ignore=Modo de Ignore +mode.ignore.exit=Voltar ao modo Normal mode.find=Modo de Busca mode.find.exit=Fechar barra de busca diff --git a/extension/locale/ru/vimfx.properties b/extension/locale/ru/vimfx.properties index df4ba83..3ddd237 100644 --- a/extension/locale/ru/vimfx.properties +++ b/extension/locale/ru/vimfx.properties @@ -73,7 +73,7 @@ mode.normal.find_next=Перейти к следующему результат mode.normal.find_previous=Перейти к предыдущему результату поиска category.misc=Разное -mode.normal.enter_mode_insert=Режим ввода: все команды игнорируются +mode.normal.enter_mode_ignore=Режим Ignore: все команды игнорируются mode.normal.quote=Передать странице следующее нажатие клавиши mode.normal.help=Show the help dialog mode.normal.dev=Открыть Панель Разработки @@ -85,8 +85,8 @@ mode.hints.rotate_markers_forward=Переставить перекрывающ mode.hints.rotate_markers_backward=Переставить перекрывающиеся маркеры в обратном порядке mode.hints.delete_hint_char=Удалить последний введённый символ -mode.insert=Режим вставки -mode.insert.exit=Вернуться в нормальный режим +mode.ignore=Режим Ignore +mode.ignore.exit=Вернуться в нормальный режим mode.find=Режим поиска mode.find.exit=Закрыть панель поиска @@ -95,7 +95,7 @@ pref.hint_chars.title=Символы на маркерах pref.hint_chars.desc= pref.black_list.title=Стоп список -pref.black_list.desc=URLs where VimFx should automatically enter Insert mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. +pref.black_list.desc=URLs where VimFx should automatically enter Ignore mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. pref.prev_patterns.title=Шаблоны ссылок на следующую страницу pref.prev_patterns.desc= diff --git a/extension/locale/sv-SE/vimfx.properties b/extension/locale/sv-SE/vimfx.properties index 5b0d726..3bdaae3 100644 --- a/extension/locale/sv-SE/vimfx.properties +++ b/extension/locale/sv-SE/vimfx.properties @@ -73,7 +73,7 @@ mode.normal.find_next=Nästa sökresultat mode.normal.find_previous=Föregående sökresultat category.misc=Övrigt -mode.normal.enter_mode_insert=Gå till Inmatningsläge: Ignorera alla kommandon +mode.normal.enter_mode_ignore=Gå till Ignoreringsläge: Ignorera alla kommandon mode.normal.quote=Skicka nästa tangenttryckning direkt till sidan mode.normal.help=Visa hjälp-rutan mode.normal.dev=Öppna utvecklarverktygsfältet @@ -85,8 +85,8 @@ mode.hints.rotate_markers_forward=Rotera överlappande etiketter framåt mode.hints.rotate_markers_backward=Rotera överlappande etiketter bakåt mode.hints.delete_hint_char=Radera senast inmatade tecken -mode.insert=Inmatingsläge -mode.insert.exit=Återvänd till Normalläge +mode.ignore=Ignoreringsläge +mode.ignore.exit=Återvänd till Normalläge mode.find=Sökläge mode.find.exit=Stäng sökpanelen diff --git a/extension/locale/zh-CN/vimfx.properties b/extension/locale/zh-CN/vimfx.properties index bc851b6..fab75db 100644 --- a/extension/locale/zh-CN/vimfx.properties +++ b/extension/locale/zh-CN/vimfx.properties @@ -73,7 +73,7 @@ mode.normal.find_next=跳到下一个查找匹配项 mode.normal.find_previous=跳到上一个查找匹配项 category.misc=杂项 -mode.normal.enter_mode_insert=进入插入模式：忽略所有命令 +mode.normal.enter_mode_ignore=进入插入模式：忽略所有命令 mode.normal.quote=把下一个按键直接发送给页面(不触发 VimFx 内设置的快捷键) mode.normal.help=Show the help dialog mode.normal.dev=打开开发者工具栏 @@ -85,8 +85,8 @@ mode.hints.rotate_markers_forward=向前旋转重叠的标记 mode.hints.rotate_markers_backward=向后旋转重叠的标记 mode.hints.delete_hint_char=删除最后输入的提示符 -mode.insert=插入模式 -mode.insert.exit=返回正常模式 +mode.ignore=插入模式 +mode.ignore.exit=返回正常模式 mode.find=查找模式 mode.find.exit=关闭查找栏 @@ -95,7 +95,7 @@ pref.hint_chars.title=提示符（Hint Chars） pref.hint_chars.desc= pref.black_list.title=黑名单 -pref.black_list.desc=URLs where VimFx should automatically enter Insert mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. +pref.black_list.desc=URLs where VimFx should automatically enter Ignore mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. pref.prev_patterns.title=上一页字符匹配 pref.prev_patterns.desc= diff --git a/extension/locale/zh-TW/vimfx.properties b/extension/locale/zh-TW/vimfx.properties index 33a6b10..92cdfd3 100644 --- a/extension/locale/zh-TW/vimfx.properties +++ b/extension/locale/zh-TW/vimfx.properties @@ -73,7 +73,7 @@ mode.normal.find_next=跳到下一個搜尋到的符合項目 mode.normal.find_previous=跳到上一個搜尋到的符合項目 category.misc=其他雜項 -mode.normal.enter_mode_insert=進入插入模式並忽略所有指令 +mode.normal.enter_mode_ignore=進入插入模式並忽略所有指令 mode.normal.quote=Pass next keypress through to the page mode.normal.help=Show the help dialog mode.normal.dev=打開開發者工具列 @@ -85,8 +85,8 @@ mode.hints.rotate_markers_forward=Rotate overlapping markers forward mode.hints.rotate_markers_backward=Rotate overlapping markers backward mode.hints.delete_hint_char=Delete last typed hint character -mode.insert=Insert Mode -mode.insert.exit=Return to normal mode +mode.ignore=Ignore Mode +mode.ignore.exit=Return to normal mode mode.find=Find Mode mode.find.exit=Close find bar @@ -95,7 +95,7 @@ pref.hint_chars.title=提示符號（Hint Chars） pref.hint_chars.desc= pref.black_list.title=黑名單 -pref.black_list.desc=URLs where VimFx should automatically enter Insert mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. +pref.black_list.desc=URLs where VimFx should automatically enter Ignore mode. You may use * as a wildcard. Example: *example.com* http://example.org/editor/*. pref.prev_patterns.title=上一頁符號比對模式 pref.prev_patterns.desc= diff --git a/extension/skin/style.css b/extension/skin/style.css index 6e04608..3cd21b6 100644 --- a/extension/skin/style.css +++ b/extension/skin/style.css @@ -43,7 +43,7 @@ toolbarpaletteitem[place="palette"] > #VimFxButton { } } -#VimFxButton[vimfx-mode="insert"] { +#VimFxButton[vimfx-mode="ignore"] { filter: grayscale(100%); } diff --git a/extension/test/test-api.coffee b/extension/test/test-api.coffee index c0e9391..d8456ca 100644 --- a/extension/test/test-api.coffee +++ b/extension/test/test-api.coffee @@ -71,11 +71,11 @@ exports['test customization'] = (assert, passed_vimfx) -> getAPI((vimfx) -> } vimfx.addCommand({ name: 'test_command' - description: 'Test insert mode command' - mode: 'insert' + description: 'Test ignore mode command' + mode: 'ignore' category: 'new_category' }, -> nonce) - vimfx.set('custom.mode.insert.test_command', 'ö <ö> ') + vimfx.set('custom.mode.ignore.test_command', 'ö <ö> ') # Test that the new simple command can be run. passed_vimfx.reset('normal') @@ -84,8 +84,8 @@ exports['test customization'] = (assert, passed_vimfx) -> getAPI((vimfx) -> assert.equal(match.command.run(), nonce) # Test that the new complex command can be run. - passed_vimfx.reset('insert') - match = passed_vimfx.consumeKeyEvent(event, 'insert') + passed_vimfx.reset('ignore') + match = passed_vimfx.consumeKeyEvent(event, 'ignore') assert.equal(match.type, 'full') assert.equal(match.command.run(), nonce) @@ -100,16 +100,16 @@ exports['test customization'] = (assert, passed_vimfx) -> getAPI((vimfx) -> assert.equal(test_command.description(), 'Test command') # Test that the new complex command can show up in the help dialog. - mode_insert = modes.find((mode) -> mode._name == 'insert') - [ category_new ] = mode_insert.categories + mode_ignore = modes.find((mode) -> mode._name == 'ignore') + [ category_new ] = mode_ignore.categories assert.equal(category_new.name, 'New category') [ test_command ] = category_new.commands - assert.equal(test_command.command.description(), 'Test insert mode command') + assert.equal(test_command.command.description(), 'Test ignore mode command') assert.deepEqual(test_command.enabledSequences, ['<ö>']) # Remove the added commands. delete vimfx.modes.normal.commands.test_command - delete vimfx.modes.insert.commands.test_command + delete vimfx.modes.ignore.commands.test_command vimfx.refresh() # Test that the new simple command cannot be run. @@ -120,8 +120,8 @@ exports['test customization'] = (assert, passed_vimfx) -> getAPI((vimfx) -> assert.notEqual(value, nonce) # Test that the new complex command cannot be run. - passed_vimfx.reset('insert') - match = passed_vimfx.consumeKeyEvent(event, 'insert') + passed_vimfx.reset('ignore') + match = passed_vimfx.consumeKeyEvent(event, 'ignore') if match.type == 'full' value = try match.command.run() catch then null assert.notEqual(value, nonce) @@ -137,8 +137,8 @@ exports['test customization'] = (assert, passed_vimfx) -> getAPI((vimfx) -> assert.notEqual(last_command.description(), 'Test command') # Test that the new complex command cannot show up in the help dialog. - mode_insert = modes.find((mode) -> mode._name == 'insert') - [ first_category ] = mode_insert.categories + mode_ignore = modes.find((mode) -> mode._name == 'ignore') + [ first_category ] = mode_ignore.categories assert.notEqual(first_category.name, 'New category') # Restore original values. @@ -205,7 +205,7 @@ exports['test addKeyOverrides'] = (assert, passed_vimfx) -> getAPI((vimfx) -> ['j', ''] ], [ - (location, mode) -> mode == 'insert' and location.href == 'about:blank' + (location, mode) -> mode == 'ignore' and location.href == 'about:blank' [''] ] ) @@ -213,7 +213,7 @@ exports['test addKeyOverrides'] = (assert, passed_vimfx) -> getAPI((vimfx) -> prefs.tmp('mode.normal.scroll_to_bottom', 'j', -> passed_vimfx.reset('normal') - match = passed_vimfx.consumeKeyEvent({key: 'j'}, 'insert') + match = passed_vimfx.consumeKeyEvent({key: 'j'}, 'ignore') assert.ok(match) passed_vimfx.currentVim = @@ -237,12 +237,12 @@ exports['test addKeyOverrides'] = (assert, passed_vimfx) -> getAPI((vimfx) -> assert.equal(match.type, 'full') assert.strictEqual(match.count, undefined) - passed_vimfx.reset('insert') + passed_vimfx.reset('ignore') - match = passed_vimfx.consumeKeyEvent({key: 'j'}, 'insert') + match = passed_vimfx.consumeKeyEvent({key: 'j'}, 'ignore') assert.ok(match) - match = passed_vimfx.consumeKeyEvent({key: 'escape'}, 'insert') + match = passed_vimfx.consumeKeyEvent({key: 'escape'}, 'ignore') assert.ok(not match) ) -- 2.39.3