Download or copy preview img when possible. (#3968) (#4004)

mozilla-services · Jan 25, 2018 · 6aa2deb · 6aa2deb
1 parent 4fae01f
commit 6aa2deb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/addon/webextension/selector/shooter.js b/addon/webextension/selector/shooter.js
@@ -163,8 +163,8 @@ this.shooter = (function() { // eslint-disable-line no-unused-vars
     }));
   };
 
-  exports.downloadShot = function(selectedPos) {
-    let dataUrl = screenshotPage(selectedPos);
+  exports.downloadShot = function(selectedPos, previewDataUrl) {
+    let dataUrl = previewDataUrl || screenshotPage(selectedPos);
     let promise = Promise.resolve(dataUrl);
     if (!dataUrl) {
       promise = callBackground(
@@ -195,7 +195,7 @@ this.shooter = (function() { // eslint-disable-line no-unused-vars
   };
 
   let copyInProgress = null;
-  exports.copyShot = function(selectedPos) {
+  exports.copyShot = function(selectedPos, previewDataUrl) {
     // This is pretty slow. We'll ignore additional user triggered copy events
     // while it is in progress.
     if (copyInProgress) {
@@ -212,7 +212,7 @@ this.shooter = (function() { // eslint-disable-line no-unused-vars
         copyInProgress = null;
       }
     }
-    let dataUrl = screenshotPage(selectedPos);
+    let dataUrl = previewDataUrl || screenshotPage(selectedPos);
     let blob = blobConverters.dataUrlToBlob(dataUrl);
     catcher.watchPromise(callBackground("copyShotToClipboard", blob).then(() => {
       uicontrol.deactivate();

diff --git a/addon/webextension/selector/uicontrol.js b/addon/webextension/selector/uicontrol.js
@@ -202,13 +202,15 @@ this.uicontrol = (function() {
       sendEvent(`download-${captureType.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase()}`, "download-preview-button");
       // Downloaded shots don't have dimension limits
       removeDimensionLimitsOnFullPageShot();
-      shooter.downloadShot(selectedPos);
+      let previewDataUrl = (captureType === "fullPageTruncated") ? null : dataUrl;
+      shooter.downloadShot(selectedPos, previewDataUrl);
     },
     onCopyPreview: () => {
       sendEvent(`copy-${captureType.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase()}`, "copy-preview-button");
       // Copied shots don't have dimension limits
       removeDimensionLimitsOnFullPageShot();
-      shooter.copyShot(selectedPos);
+      let previewDataUrl = (captureType === "fullPageTruncated") ? null : dataUrl;
+      shooter.copyShot(selectedPos, previewDataUrl);
     }
   };