Add one-click "Download as Zip" option #50

Re-using the popup for the existing download progress UI.
Rob--W · Dec 7, 2017 · 1b65a84 · 1b65a84
1 parent 9ca34f8
commit 1b65a84
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 11 deletions.
diff --git a/src/background.js b/src/background.js
@@ -63,6 +63,7 @@ chrome.storage.sync.get({
 
 chrome.pageAction.onClicked.addListener(function(tab) {
     if (gActionClickAction === 'popup') return;
+    if (gActionClickAction === 'download') return;
     var crx_url = get_crx_url(tab.url);
     var filename = get_zip_name(crx_url);
     if (!crx_url) {
@@ -77,16 +78,17 @@ chrome.pageAction.onClicked.addListener(function(tab) {
         });
         return;
     }
-    if (gActionClickAction === 'download') {
-        console.error('not implemented yet');
-        return;
-    }
     console.error('Unexpected gActionClickAction: ' + gActionClickAction);
 });
 
 function setActionClickAction(actionClickAction) {
-    if (actionClickAction) {
+    if (actionClickAction && gActionClickAction !== actionClickAction) {
         gActionClickAction = actionClickAction;
+        chrome.tabs.query({
+            active: true,
+        }, function(tabs) {
+            tabs.forEach(showPageActionIfNeeded);
+        });
     }
 }
 
@@ -194,10 +196,21 @@ function dwr_onMessage(details) {
 }
 //#endif
 function showPageAction(tabId, url) {
-    var params = url ? encodeQueryString({crx: url}) : '';
+    var popup;
+    if (gActionClickAction === 'view-source') {
+        // Let pageAction.onClicked handle this.
+        popup = '';
+    } else if (gActionClickAction === 'popup' ||
+        gActionClickAction === 'download') {
+        var params = {};
+        if (url) params.crx = url;
+        if (gActionClickAction === 'download') params.doDownload = 1;
+        popup = 'popup.html?' + encodeQueryString(params);
+    }
+
     chrome.pageAction.setPopup({
         tabId: tabId,
-        popup: gActionClickAction === 'popup' ? 'popup.html?' + params : '',
+        popup: popup,
     });
     chrome.pageAction.show(tabId);
 }

diff --git a/src/bg-contextmenu.js b/src/bg-contextmenu.js
@@ -83,9 +83,7 @@
         chrome.contextMenus.create({
             id: MENU_ID_ACTION_MENU_DOWNLOAD,
             parentId: MENU_ID_ACTION_MENU,
-            // TODO: Support this and enable the option.
-            title: 'Download as zip (not supported yet)',
-            enabled: false,
+            title: 'Download as zip',
             type: 'radio',
             contexts: ['page_action'],
 //#if FIREFOX

diff --git a/src/popup.html b/src/popup.html
@@ -20,10 +20,17 @@
         height: 10px;
         width: 100%;
     }
+    #download.downloading .idle,
+    #download:not(.downloading) .busy {
+        display: none;
+    }
 </style>
 </head>
 <body>
-<button id="download" title="Download extension in zip format">Download as zip</button>
+<button id="download" title="Download extension in zip format">
+    <span class="idle">Download as zip</span>
+    <span class="busy">Downloading...</span>
+</button>
 <button id="view-source" title="View source of extension in a new tab">View source</button>
 <!--#if OPERA-->
 <button id="install-as-nex" title="install the extension">Install</button>

diff --git a/src/popup.js b/src/popup.js
@@ -38,6 +38,9 @@ function ready() {
 //#if OPERA
     document.getElementById('install-as-nex').onclick = doInstall;
 //#endif
+    if (getParam('doDownload')) {
+        doDownload();
+    }
 }
 var hasDownloadedOnce = false;
 function doDownload() {
@@ -49,10 +52,12 @@ function doDownload() {
         tryTriggerDownload(blob, filename);
     }, function(errorMessage) {
         hasDownloadedOnce = false;
+        document.getElementById('download').classList.toggle('downloading', hasDownloadedOnce);
         console.error(errorMessage);
         alert('Error in CRX Viewer:\n\n' + errorMessage);
     }, onXHRprogress.bind(null, document.getElementById('download')));
     hasDownloadedOnce = true;
+    document.getElementById('download').classList.toggle('downloading', hasDownloadedOnce);
 }
 function doViewSource() {
     chrome.tabs.create({