From 44ca2989fc11fd6c9228ca0cee67a7fb00357ffd Mon Sep 17 00:00:00 2001
From: Thomas Weber <muffin@muffin.ink>
Date: Wed, 11 May 2022 17:59:39 -0500
Subject: [PATCH] Fix a couple regressions from moving downloads to separate
 component

---
 src/locales/en.json           |  8 +++---
 src/p4/Downloads.svelte       | 54 +++++++++++++++--------------------
 src/p4/PackagerOptions.svelte | 16 +++++++----
 3 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 171b7f9..78294b8 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -457,6 +457,10 @@
     "resetAll": {
       "string": "Reset All",
       "context": "Button that resets all settings"
+    },
+    "downloadsWillAppearHere": {
+      "string": "Downloads will appear here",
+      "context": "Placeholder that appears when no project has been packaged yet so there is nothing to download"
     }
   },
   "downloads": {
@@ -464,10 +468,6 @@
       "string": "Download {filename} ({size})",
       "context": "Link to download project after it has been packaged. filename might be \"Packaged Project.html\" and size might be \"6.2MB\""
     },
-    "placeholder": {
-      "string": "Downloads will appear here",
-      "context": "Placeholder that appears when no project has been packaged yet so there is nothing to download"
-    },
     "useWorkaround": {
       "string": "Click here if download link doesn't work",
       "context": "Buttons that appears when downloading certain file types on certain systems to work around system bugs that prevent downloading files."
diff --git a/src/p4/Downloads.svelte b/src/p4/Downloads.svelte
index aa73b38..a42e00f 100644
--- a/src/p4/Downloads.svelte
+++ b/src/p4/Downloads.svelte
@@ -46,36 +46,28 @@
   }
 </style>
 
-{#if url}
-  <Section center>
-    <div>
-      <p>
-        <a href={url} download={name}>
-          {$_('downloads.link')
-            .replace('{size}', `${(blob.size / 1000 / 1000).toFixed(2)}MB`)
-            .replace('{filename}', name)}
-        </a>
-      </p>
-      {#if isChromeOS && name.endsWith('.html')}
-        <p class="alternative">
-          <button
-            on:click={useAlternativeDownloadToBypassChromeOSBugs}
-            disabled={zipping}
-          >
-            {#if zipping}
-              {$_('downloads.workaroundInProgress')}
-            {:else}
-              {$_('downloads.useWorkaround')}
-            {/if}
-          </button>
-        </p>
-      {/if}
-    </div>
-  </Section>
-{:else}
-  <Section caption>
+<Section center>
+  <div>
     <p>
-      {$_('downloads.placeholder')}
+      <a href={url} download={name}>
+        {$_('downloads.link')
+          .replace('{size}', `${(blob.size / 1000 / 1000).toFixed(2)}MB`)
+          .replace('{filename}', name)}
+      </a>
     </p>
-  </Section>
-{/if}
+    {#if isChromeOS && name.endsWith('.html')}
+      <p class="alternative">
+        <button
+          on:click={useAlternativeDownloadToBypassChromeOSBugs}
+          disabled={zipping}
+        >
+          {#if zipping}
+            {$_('downloads.workaroundInProgress')}
+          {:else}
+            {$_('downloads.useWorkaround')}
+          {/if}
+        </button>
+      </p>
+    {/if}
+  </div>
+</Section>
diff --git a/src/p4/PackagerOptions.svelte b/src/p4/PackagerOptions.svelte
index 72e91c2..91b82f6 100644
--- a/src/p4/PackagerOptions.svelte
+++ b/src/p4/PackagerOptions.svelte
@@ -861,8 +861,14 @@
   </div>
 </Section>
 
-<Downloads
-  name={result ? result.filename : null}
-  url={result ? result.url : null}
-  blob={result ? result.blob : null}
-/>
+{#if result}
+  <Downloads
+    name={result ? result.filename : null}
+    url={result ? result.url : null}
+    blob={result ? result.blob : null}
+  />
+{:else if !$progress.visible}
+  <Section caption>
+    <p>{$_('options.downloadsWillAppearHere')}</p>
+  </Section>
+{/if}