From f483119a404c84f3f6dd8b93fdec9226c80818e1 Mon Sep 17 00:00:00 2001 From: Charles Renwick Date: Tue, 21 Nov 2017 10:26:30 -0500 Subject: [PATCH 1/4] Adds shortcut to open containers. Makes it more effective to open the first ten containers in the containers list. Keys 1-0 will open containers 1-10, if that container exists. Note: the plugin's popup panel does not autofocus when opened. This requires the user to focus on the panel by either clicking or pressing TAB before using shortcut keys. This behavior is consistent with the previous shortcuts for this addon. --- webextension/js/popup.js | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/webextension/js/popup.js b/webextension/js/popup.js index 37666c1..765be33 100644 --- a/webextension/js/popup.js +++ b/webextension/js/popup.js @@ -516,6 +516,12 @@ Logic.registerPanel(P_CONTAINERS_LIST, { previousElement.focus(); } } + function select(num) { + const element = selectables[num]; + if (element) { + element.click(); + } + } switch (e.keyCode) { case 40: next(); @@ -523,6 +529,36 @@ Logic.registerPanel(P_CONTAINERS_LIST, { case 38: previous(); break; + case 49: + select(1); + break; + case 50: + select(2); + break; + case 51: + select(3); + break; + case 52: + select(4); + break; + case 53: + select(5); + break; + case 53: + select(6); + break; + case 53: + select(7); + break; + case 53: + select(8); + break; + case 53: + select(99); + break; + case 48: + select(10); + break; } }); From 1d78febafc94110d81573d2d886ded7a05f662fc Mon Sep 17 00:00:00 2001 From: Charles Renwick Date: Tue, 21 Nov 2017 10:47:30 -0500 Subject: [PATCH 2/4] fixes keyCodes --- webextension/js/popup.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/webextension/js/popup.js b/webextension/js/popup.js index 765be33..1d795bc 100644 --- a/webextension/js/popup.js +++ b/webextension/js/popup.js @@ -544,17 +544,17 @@ Logic.registerPanel(P_CONTAINERS_LIST, { case 53: select(5); break; - case 53: + case 54: select(6); break; - case 53: + case 55: select(7); break; - case 53: + case 56: select(8); break; - case 53: - select(99); + case 57: + select(9); break; case 48: select(10); From cf26d8547afe9cf7f7e52ed1ad1b59f803404820 Mon Sep 17 00:00:00 2001 From: Charles Renwick Date: Tue, 28 Nov 2017 11:29:28 -0500 Subject: [PATCH 3/4] Consolidates switch pattern for shortcut keys. Applies @groovecoder suggestions to consolidate a long switch statement. --- webextension/js/popup.js | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/webextension/js/popup.js b/webextension/js/popup.js index 1d795bc..faaea97 100644 --- a/webextension/js/popup.js +++ b/webextension/js/popup.js @@ -529,36 +529,14 @@ Logic.registerPanel(P_CONTAINERS_LIST, { case 38: previous(); break; - case 49: - select(1); - break; - case 50: - select(2); - break; - case 51: - select(3); - break; - case 52: - select(4); - break; - case 53: - select(5); - break; - case 54: - select(6); - break; - case 55: - select(7); - break; - case 56: - select(8); - break; - case 57: - select(9); - break; case 48: select(10); break; + default: + if (e.keyCode >= 49 && e.keyCode <= 57) { + select(e.keyCode - 48); + } + break; } }); From 752b1c3b2796494d4d5b9cdd170007e67b1dee59 Mon Sep 17 00:00:00 2001 From: Charles Renwick Date: Tue, 28 Nov 2017 16:14:03 -0500 Subject: [PATCH 4/4] Removes shortcut for the tenth container. --- webextension/js/popup.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/webextension/js/popup.js b/webextension/js/popup.js index faaea97..a644322 100644 --- a/webextension/js/popup.js +++ b/webextension/js/popup.js @@ -516,12 +516,6 @@ Logic.registerPanel(P_CONTAINERS_LIST, { previousElement.focus(); } } - function select(num) { - const element = selectables[num]; - if (element) { - element.click(); - } - } switch (e.keyCode) { case 40: next(); @@ -529,12 +523,12 @@ Logic.registerPanel(P_CONTAINERS_LIST, { case 38: previous(); break; - case 48: - select(10); - break; default: if (e.keyCode >= 49 && e.keyCode <= 57) { - select(e.keyCode - 48); + const element = selectables[e.keyCode - 48]; + if (element) { + element.click(); + } } break; }