Prechádzať zdrojové kódy

fix `cancel all` button in Dashboard, used with Multipart

Artur Paikin 8 rokov pred
rodič
commit
6178ec1ba6

+ 2 - 1
src/plugins/Dashboard/Dashboard.js

@@ -154,7 +154,8 @@ export default function Dashboard (props) {
             totalETA: props.totalETA,
             totalETA: props.totalETA,
             startUpload: props.startUpload,
             startUpload: props.startUpload,
             newFileCount: props.newFiles.length,
             newFileCount: props.newFiles.length,
-            i18n: props.i18n
+            i18n: props.i18n,
+            resumableUploads: props.resumableUploads
           })}
           })}
 
 
           ${props.progressindicators.map((target) => {
           ${props.progressindicators.map((target) => {

+ 11 - 10
src/plugins/Dashboard/StatusBar.js

@@ -46,18 +46,19 @@ export default (props) => {
 // }
 // }
 
 
 const pauseResumeButtons = (props) => {
 const pauseResumeButtons = (props) => {
+  console.log(props.resumableUploads)
   return html`<button class="UppyDashboard-statusBarAction" type="button" onclick=${() => togglePauseResume(props)}>
   return html`<button class="UppyDashboard-statusBarAction" type="button" onclick=${() => togglePauseResume(props)}>
-    ${props.isAllPaused
-      ? html`<svg class="UppyIcon" width="15" height="17" viewBox="0 0 11 13">
-        <path d="M1.26 12.534a.67.67 0 0 1-.674.012.67.67 0 0 1-.336-.583v-11C.25.724.38.5.586.382a.658.658 0 0 1 .673.012l9.165 5.5a.66.66 0 0 1 .325.57.66.66 0 0 1-.325.573l-9.166 5.5z" />
-      </svg>`
-      : props.isResumable
-        ? html`<svg class="UppyIcon" width="16" height="17" viewBox="0 0 12 13">
-          <path d="M4.888.81v11.38c0 .446-.324.81-.722.81H2.722C2.324 13 2 12.636 2 12.19V.81c0-.446.324-.81.722-.81h1.444c.398 0 .722.364.722.81zM9.888.81v11.38c0 .446-.324.81-.722.81H7.722C7.324 13 7 12.636 7 12.19V.81c0-.446.324-.81.722-.81h1.444c.398 0 .722.364.722.81z"/>
+    ${props.resumableUploads
+      ? props.isAllPaused
+        ? html`<svg class="UppyIcon" width="15" height="17" viewBox="0 0 11 13">
+          <path d="M1.26 12.534a.67.67 0 0 1-.674.012.67.67 0 0 1-.336-.583v-11C.25.724.38.5.586.382a.658.658 0 0 1 .673.012l9.165 5.5a.66.66 0 0 1 .325.57.66.66 0 0 1-.325.573l-9.166 5.5z" />
         </svg>`
         </svg>`
-        : html`<svg class="UppyIcon" width="16px" height="16px" viewBox="0 0 19 19">
-          <path d="M17.318 17.232L9.94 9.854 9.586 9.5l-.354.354-7.378 7.378h.707l-.62-.62v.706L9.318 9.94l.354-.354-.354-.354L1.94 1.854v.707l.62-.62h-.706l7.378 7.378.354.354.354-.354 7.378-7.378h-.707l.622.62v-.706L9.854 9.232l-.354.354.354.354 7.378 7.378.708-.707-7.38-7.378v.708l7.38-7.38.353-.353-.353-.353-.622-.622-.353-.353-.354.352-7.378 7.38h.708L2.56 1.23 2.208.88l-.353.353-.622.62-.353.355.352.353 7.38 7.38v-.708l-7.38 7.38-.353.353.352.353.622.622.353.353.354-.353 7.38-7.38h-.708l7.38 7.38z"/>
+        : html`<svg class="UppyIcon" width="16" height="17" viewBox="0 0 12 13">
+          <path d="M4.888.81v11.38c0 .446-.324.81-.722.81H2.722C2.324 13 2 12.636 2 12.19V.81c0-.446.324-.81.722-.81h1.444c.398 0 .722.364.722.81zM9.888.81v11.38c0 .446-.324.81-.722.81H7.722C7.324 13 7 12.636 7 12.19V.81c0-.446.324-.81.722-.81h1.444c.398 0 .722.364.722.81z"/>
         </svg>`
         </svg>`
+      : html`<svg class="UppyIcon" width="16px" height="16px" viewBox="0 0 19 19">
+        <path d="M17.318 17.232L9.94 9.854 9.586 9.5l-.354.354-7.378 7.378h.707l-.62-.62v.706L9.318 9.94l.354-.354-.354-.354L1.94 1.854v.707l.62-.62h-.706l7.378 7.378.354.354.354-.354 7.378-7.378h-.707l.622.62v-.706L9.854 9.232l-.354.354.354.354 7.378 7.378.708-.707-7.38-7.378v.708l7.38-7.38.353-.353-.353-.353-.622-.622-.353-.353-.354.352-7.378 7.38h.708L2.56 1.23 2.208.88l-.353.353-.622.62-.353.355.352.353 7.38 7.38v-.708l-7.38 7.38-.353.353.352.353.622.622.353.353.354-.353 7.38-7.38h-.708l7.38 7.38z"/>
+      </svg>`
     }
     }
   </button>`
   </button>`
 }
 }
@@ -65,7 +66,7 @@ const pauseResumeButtons = (props) => {
 const togglePauseResume = (props) => {
 const togglePauseResume = (props) => {
   if (props.isAllComplete) return
   if (props.isAllComplete) return
 
 
-  if (!props.isResumable) {
+  if (!props.resumableUploads) {
     return props.cancelAll()
     return props.cancelAll()
   }
   }