diff options
| author | Einar Egilsson <einar@einaregilsson.com> | 2014-09-07 17:49:44 +0000 |
|---|---|---|
| committer | Einar Egilsson <einar@einaregilsson.com> | 2014-09-07 17:49:44 +0000 |
| commit | dfa02f353906d63ee67d1924e5e4c39f615663a5 (patch) | |
| tree | 57c1c68f8b6c757c769090f96d09e014356d645a | |
| parent | 404372326e9d854b065175ef1f4634fd78ca8afa (diff) | |
| parent | b560af11be809932cc9b96ed569f5ca6f3526bf2 (diff) | |
Merge pull request #4 from duelafn/Alt-r_toggle
Configuration to disable Alt-r hotkey
| -rw-r--r-- | chrome/js/browserOverlay.js | 2 | ||||
| -rw-r--r-- | chrome/redirector.html | 1 | ||||
| -rw-r--r-- | defaults/preferences/redirector.preferences.js | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/chrome/js/browserOverlay.js b/chrome/js/browserOverlay.js index ed1ab73..019505f 100644 --- a/chrome/js/browserOverlay.js +++ b/chrome/js/browserOverlay.js @@ -18,7 +18,7 @@ var RedirectorOverlay = { this.changedPrefs(this.prefs); this.prefs.addListener(this); document.addEventListener('keypress', function(event) { - if ((event.charCode == 114) && event.altKey) { //alt+r + if ((RedirectorOverlay.prefs.enableShortcutKey) && (event.charCode == 114) && event.altKey) { //alt+r RedirectorOverlay.toggleEnabled(); } }, true); diff --git a/chrome/redirector.html b/chrome/redirector.html index 68300c1..eb0baa7 100644 --- a/chrome/redirector.html +++ b/chrome/redirector.html @@ -31,6 +31,7 @@ <input type="checkbox" id="enable-redirector" data-pref="enabled" /><label>Enabled</label><br /> <input type="checkbox" id="show-status-bar-icon" data-pref="showStatusBarIcon"/><label>Statusbar icon</label><br /> <input type="checkbox" id="show-context-menu" data-pref="showContextMenu"/><label>Context menu</label><br /> + <input type="checkbox" id="enable-shortcut-key" data-pref="enableShortcutKey"/><label>Enable/Disable via Alt-r</label><br /> <input type="checkbox" id="enable-debug-output" data-pref="debugEnabled"/><label>Debug output</label><br /> <div class="button-row"> <button id="close">Close</button> diff --git a/defaults/preferences/redirector.preferences.js b/defaults/preferences/redirector.preferences.js index 4464a8a..c6b864f 100644 --- a/defaults/preferences/redirector.preferences.js +++ b/defaults/preferences/redirector.preferences.js @@ -3,6 +3,7 @@ pref("extensions.redirector.debugEnabled", false); pref("extensions.redirector.enabled", true); pref("extensions.redirector.showContextMenu", true); pref("extensions.redirector.showStatusBarIcon", true); +pref("extensions.redirector.enableShortcutKey", true); pref("extensions.redirector.version", 'undefined'); pref("extensions.redirector.defaultDir", ''); pref("extensions.redirector.proxyServerPort", 4815); |