Merge pull request #3738 from chenba/3714-enter-key-action

Download shot when Enter is pressed in download only mode.
mozilla-services · Nov 8, 2017 · d01d442 · d01d442
2 parents 49bafca + df973cd
commit d01d442
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/addon/webextension/selector/ui.js b/addon/webextension/selector/ui.js
@@ -91,7 +91,7 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
     return result;
   }
 
-  function isDownloadOnly() {
+  let isDownloadOnly = exports.isDownloadOnly = function() {
     return window.downloadOnly;
   }
 

diff --git a/addon/webextension/selector/uicontrol.js b/addon/webextension/selector/uicontrol.js
@@ -966,8 +966,11 @@ this.uicontrol = (function() {
       sendEvent("cancel-shot", "keyboard-escape");
       exports.deactivate();
     }
-    if ((event.key || event.code) === "Enter") {
-      if (getState.state === "selected") {
+    if ((event.key || event.code) === "Enter" && getState.state === "selected") {
+      if (ui.isDownloadOnly()) {
+        sendEvent("download-shot", "keyboard-enter");
+        shooter.downloadShot(selectedPos);
+      } else {
         sendEvent("save-shot", "keyboard-enter");
         shooter.takeShot("selection", selectedPos);
       }