From 7d4a3f2f3f2909e4b4bcafd22581407f0894350e Mon Sep 17 00:00:00 2001
From: Simon Lydell <simon.lydell@gmail.com>
Date: Mon, 19 Jan 2015 17:12:03 +0100
Subject: [PATCH] Remove alt-shift-v shortcut to toggle VimFx

It has always worked inreliably and cannot be customized. It is better to use
insert mode.

Closes #64. Closes #432.
---
 README.md                               |  2 --
 extension/lib/button.coffee             | 20 ++------------------
 extension/locale/de/vimfx.properties    |  4 ++--
 extension/locale/el-GR/vimfx.properties |  4 ++--
 extension/locale/en-US/vimfx.properties |  4 ++--
 extension/locale/hu/vimfx.properties    |  4 ++--
 extension/locale/id/vimfx.properties    |  4 ++--
 extension/locale/it/vimfx.properties    |  4 ++--
 extension/locale/ja/vimfx.properties    |  4 ++--
 extension/locale/nl/vimfx.properties    |  4 ++--
 extension/locale/pl/vimfx.properties    |  4 ++--
 extension/locale/ru/vimfx.properties    |  4 ++--
 extension/locale/zh-CN/vimfx.properties |  4 ++--
 extension/locale/zh-TW/vimfx.properties |  4 ++--
 14 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/README.md b/README.md
index 0c30e3b..58553e9 100644
--- a/README.md
+++ b/README.md
@@ -43,8 +43,6 @@ VimFx will be nice to your browser and to your habits. Promise.
 This is a text representation of the keyboard shortcuts dialog within the extension. Might not be up to date.
 Press ? or use the toolbar button to open the dialog, which helps you remember the shortcuts, and lets you customize them.
 
-Global shortcut to enable/disable VimFx: `shift-alt-v`
-
 ### Dealing with URLs
 
     o       Focus the Address Bar
diff --git a/extension/lib/button.coffee b/extension/lib/button.coffee
index c64a198..26f17f2 100644
--- a/extension/lib/button.coffee
+++ b/extension/lib/button.coffee
@@ -25,9 +25,7 @@
 utils          = require('./utils')
 _              = require('./l10n')
 
-KEYSET_ID             = 'vimfx-keyset'
 BUTTON_ID             = 'vimfx-toolbar-button'
-KEY_ID                = 'vimfx-key'
 MENUPOPUP_ID          = 'vimfx-menupopup'
 MENU_ITEM_PREF        = 'vimfx-menu-item-preferences'
 MENU_ITEM_HELP        = 'vimfx-menu-item-help'
@@ -46,7 +44,7 @@ addToolbarButton = (vimBucket, window) ->
   document = window.document
   win = document.querySelector('window')
 
-  [ button, keyset ] = createButton(vimBucket, window)
+  button = createButton(vimBucket, window)
 
   # Namespace to put the VimFx state on, for example.
   button.VimFx = {}
@@ -58,11 +56,8 @@ addToolbarButton = (vimBucket, window) ->
   disabled = getPref('disabled')
   updateToolbarButton(window, {disabled, blacklisted})
 
-  win.appendChild(keyset)
-
   module.onShutdown(->
     button.remove()
-    keyset.remove()
     $(document, 'navigator-toolbox').palette.removeChild(button)
   )
 
@@ -96,18 +91,7 @@ createButton = (vimBucket, window) ->
 
   button.addEventListener('command', onButtonCommand, false)
 
-  vimkey = utils.createElement(document, 'key', {
-    id: KEY_ID
-    key: 'V'
-    modifiers: 'shift,alt'
-    oncommand: 'void(0);'
-  })
-  vimkey.addEventListener('command', onButtonCommand, false)
-
-  keyset = utils.createElement(document, 'keyset', {id: KEYSET_ID})
-  keyset.appendChild(vimkey)
-
-  return [button, keyset]
+  return button
 
 createMenupopup = (window, button) ->
   document = window.document
diff --git a/extension/locale/de/vimfx.properties b/extension/locale/de/vimfx.properties
index 3943982..94fa7cb 100644
--- a/extension/locale/de/vimfx.properties
+++ b/extension/locale/de/vimfx.properties
@@ -1,5 +1,5 @@
-button_tooltip_enabled=VimFx ist aktiviert. Zum Deaktivieren hier klicken. (shift-alt-v)
-button_tooltip_disabled=VimFx ist deaktiviert. Zum Aktivieren hier klicken. (shift-alt-v)
+button_tooltip_enabled=VimFx ist aktiviert. Zum Deaktivieren hier klicken.
+button_tooltip_disabled=VimFx ist deaktiviert. Zum Aktivieren hier klicken.
 button_tooltip_blacklisted=Diese Seite ist auf der schwarzen Liste
 button_tooltip_insertMode=VimFx ist im Eingabemodus auf dieser Seite: Alle Befehle werden ignoriert. Zum Verlassen hier klicken (<c-escape> [per Voreinstellung])
 item_preferences=Einstellungen
diff --git a/extension/locale/el-GR/vimfx.properties b/extension/locale/el-GR/vimfx.properties
index fdf35ad..833989c 100644
--- a/extension/locale/el-GR/vimfx.properties
+++ b/extension/locale/el-GR/vimfx.properties
@@ -1,5 +1,5 @@
-button_tooltip_enabled=Το VimFx είναι ενεργοποιημένο. Κάντε κλικ για να το απενεργοποιήσετε (shift-alt-v)
-button_tooltip_disabled=Το VimFx είναι απενεργοποιημένο. Κάντε κλικ για να το ενεργοποιήσετε (shift-alt-v)
+button_tooltip_enabled=Το VimFx είναι ενεργοποιημένο. Κάντε κλικ για να το απενεργοποιήσετε.
+button_tooltip_disabled=Το VimFx είναι απενεργοποιημένο. Κάντε κλικ για να το ενεργοποιήσετε.
 button_tooltip_blacklisted=Το VimFx είναι στην μαύρη λίστα σε αυτήν την σελίδα.
 button_tooltip_insertMode=Το VimFx είναι σε λειτουργία εισαγωγής (insert mode) σε αυτή τη Σελίδα: Όλες οι εντολές αγνοούνται. Κάντε κλικ για να βγείτε (<c-escape> [προεπιλεγμένο])
 item_preferences=Προτιμήσεις
diff --git a/extension/locale/en-US/vimfx.properties b/extension/locale/en-US/vimfx.properties
index c094e6a..40e67ed 100644
--- a/extension/locale/en-US/vimfx.properties
+++ b/extension/locale/en-US/vimfx.properties
@@ -1,5 +1,5 @@
-button_tooltip_enabled=VimFx is Enabled. Click to Disable (shift-alt-v)
-button_tooltip_disabled=VimFx is Disabled. Click to Enable (shift-alt-v)
+button_tooltip_enabled=VimFx is Enabled. Click to Disable.
+button_tooltip_disabled=VimFx is Disabled. Click to Enable.
 button_tooltip_blacklisted=VimFx is Blacklisted on this Page
 button_tooltip_insertMode=VimFx is in insert mode on this Page: All commands are ignored. Click to exit (<c-escape> [by default])
 item_preferences=Preferences
diff --git a/extension/locale/hu/vimfx.properties b/extension/locale/hu/vimfx.properties
index cf53cd2..b50b385 100644
--- a/extension/locale/hu/vimfx.properties
+++ b/extension/locale/hu/vimfx.properties
@@ -1,5 +1,5 @@
-button_tooltip_enabled=VimFx aktív. Kattints az inaktiváláshoz (shift-alt-v)
-button_tooltip_disabled=VimFx inaktív. Kattints az aktiváláshoz (shift-alt-v)
+button_tooltip_enabled=VimFx aktív. Kattints az inaktiváláshoz.
+button_tooltip_disabled=VimFx inaktív. Kattints az aktiváláshoz.
 button_tooltip_blacklisted=Az oldal feketelistázva a VimFX-ben.
 button_tooltip_insertMode=VimFx is in insert mode on this Page: All commands are ignored. Click to exit (<c-escape> [by default])
 item_preferences=Beállítások
diff --git a/extension/locale/id/vimfx.properties b/extension/locale/id/vimfx.properties
index 28b4593..afbf4c2 100644
--- a/extension/locale/id/vimfx.properties
+++ b/extension/locale/id/vimfx.properties
@@ -1,5 +1,5 @@
-button_tooltip_enabled=VimFx telah Aktif. Klik untuk Nonaktifkan (shift-alt-v)
-button_tooltip_disabled=VimFx telah Nonaktif. Klik untuk Aktifkan (shift-alt-v)
+button_tooltip_enabled=VimFx telah Aktif. Klik untuk Nonaktifkan.
+button_tooltip_disabled=VimFx telah Nonaktif. Klik untuk Aktifkan.
 button_tooltip_blacklisted=VimFx telah Dilarang pada halaman ini
 button_tooltip_insertMode=VimFx is in insert mode on this Page: All commands are ignored. Click to exit (<c-escape> [by default])
 item_preferences=Preferensi
diff --git a/extension/locale/it/vimfx.properties b/extension/locale/it/vimfx.properties
index f575c52..5ebf419 100644
--- a/extension/locale/it/vimfx.properties
+++ b/extension/locale/it/vimfx.properties
@@ -1,5 +1,5 @@
-button_tooltip_enabled=VimFx è abilitato. Clicca per disabilitarlo (maiusc-alt-v)
-button_tooltip_disabled=VimFx è disabilitato. Clicca per abilitarlo (maiusc-alt-v)
+button_tooltip_enabled=VimFx è abilitato. Clicca per disabilitarlo.
+button_tooltip_disabled=VimFx è disabilitato. Clicca per abilitarlo.
 button_tooltip_blacklisted=VimFx è nella lista nera per questa pagina
 button_tooltip_insertMode=VimFx è in modalità inserimento per questa pagina: tutti i comandi verranno ignorati. Premi per uscire (<c-escape> [predefinito])
 item_preferences=Preferenze
diff --git a/extension/locale/ja/vimfx.properties b/extension/locale/ja/vimfx.properties
index f036dd0..59a1eec 100644
--- a/extension/locale/ja/vimfx.properties
+++ b/extension/locale/ja/vimfx.properties
@@ -1,5 +1,5 @@
-button_tooltip_enabled=VimFXは有効です。クリックすると無効にします (shift-alt-v)
-button_tooltip_disabled=VimFXは無効です。クリックすると有効にします (shift-alt-v)
+button_tooltip_enabled=VimFXは有効です。クリックすると無効にします。
+button_tooltip_disabled=VimFXは無効です。クリックすると有効にします。
 button_tooltip_blacklisted=VimFXはこのページをブラックリストに登録しています
 button_tooltip_insertMode=VimFXはこのページでは挿入モードです。全てのコマンドは無視されます。クリックすると抜けます (<c-escape> [既定値])
 item_preferences=設定
diff --git a/extension/locale/nl/vimfx.properties b/extension/locale/nl/vimfx.properties
index 27bce1e..31debbb 100644
--- a/extension/locale/nl/vimfx.properties
+++ b/extension/locale/nl/vimfx.properties
@@ -1,5 +1,5 @@
-button_tooltip_enabled=VimFx is ingeschakeld. Klik om uit te schakelen (shift-alt-v)
-button_tooltip_disabled=VimFx is uitgeschakeld. Klik om in te schakelen (shift-alt-v)
+button_tooltip_enabled=VimFx is ingeschakeld. Klik om uit te schakelen.
+button_tooltip_disabled=VimFx is uitgeschakeld. Klik om in te schakelen.
 button_tooltip_blacklisted=VimFx is uitgeschakeld op deze pagina
 button_tooltip_insertMode=VimFx is in insert mode on this Page: All commands are ignored. Click to exit (<c-escape> [by default])
 item_preferences=Instellingen
diff --git a/extension/locale/pl/vimfx.properties b/extension/locale/pl/vimfx.properties
index 4d838e8..af71f35 100644
--- a/extension/locale/pl/vimfx.properties
+++ b/extension/locale/pl/vimfx.properties
@@ -1,5 +1,5 @@
-button_tooltip_enabled=VimFx jest włączony. Kliknij, aby wyłączyć (shift-alt-v)
-button_tooltip_disabled=VimFx jest wyłączony. Kliknij, aby włączyć (shift-alt-v)
+button_tooltip_enabled=VimFx jest włączony. Kliknij, aby wyłączyć.
+button_tooltip_disabled=VimFx jest wyłączony. Kliknij, aby włączyć.
 button_tooltip_blacklisted=Ta strona jest na czarnej liście VimFx
 button_tooltip_insertMode=VimFx jest w insert mode na tej stronie: wszystkie komendy są ignorowane. Kliknij, aby wyjść (<c-escape> [domyślnie])
 item_preferences=Preferencje
diff --git a/extension/locale/ru/vimfx.properties b/extension/locale/ru/vimfx.properties
index 92c0cf1..a36bdec 100644
--- a/extension/locale/ru/vimfx.properties
+++ b/extension/locale/ru/vimfx.properties
@@ -1,5 +1,5 @@
-button_tooltip_enabled=VimFx работает. Нажмите чтобы выключить (shift-alt-v)
-button_tooltip_disabled=VimFx не работает. Нажмите чтобы включить (shift-alt-v)
+button_tooltip_enabled=VimFx работает. Нажмите чтобы выключить.
+button_tooltip_disabled=VimFx не работает. Нажмите чтобы включить.
 button_tooltip_blacklisted=VimFx содержит текущую страницу в стоп-списке
 button_tooltip_insertMode=VimFx в режиме ввода на этой странице: все команды игнорируются. Нажмите чтобы для выхода (<c-escape>)
 item_preferences=Настройки
diff --git a/extension/locale/zh-CN/vimfx.properties b/extension/locale/zh-CN/vimfx.properties
index 4624275..f36e048 100644
--- a/extension/locale/zh-CN/vimfx.properties
+++ b/extension/locale/zh-CN/vimfx.properties
@@ -1,5 +1,5 @@
-button_tooltip_enabled=VimFx 已启用。点击禁用 (shift-alt-v)
-button_tooltip_disabled=VimFx 已禁用。点击启用 (shift-alt-v)
+button_tooltip_enabled=VimFx 已启用。点击禁用。
+button_tooltip_disabled=VimFx 已禁用。点击启用。
 button_tooltip_blacklisted=当前页面已被列入黑名单
 button_tooltip_insertMode=VimFx 在当前页面处于插入模式：所有命令都将被忽略。点击退出（<c-escape>［默认］）
 item_preferences=首选项
diff --git a/extension/locale/zh-TW/vimfx.properties b/extension/locale/zh-TW/vimfx.properties
index 7779cff..efc9c90 100644
--- a/extension/locale/zh-TW/vimfx.properties
+++ b/extension/locale/zh-TW/vimfx.properties
@@ -1,5 +1,5 @@
-button_tooltip_enabled=VimFx 已啓用。輸入(shift-alt-v)快速鍵以停用
-button_tooltip_disabled=VimFx 已停用。輸入(shift-alt-v)快速鍵以啓用
+button_tooltip_enabled=VimFx 已啓用。輸入快速鍵以停用。
+button_tooltip_disabled=VimFx 已停用。輸入快速鍵以啓用。
 button_tooltip_blacklisted=VimFx在此網頁上被設定為停用
 button_tooltip_insertMode=VimFx在此網頁上正處於插入模式，所有的指令都將被忽略。按下（<c-escape>［預設］）跳出。
 item_preferences=偏好設定
-- 
2.39.3