Преглед на файлове

dashboard: still allow individual pause/resume on non-cancellable uploads

Renée Kooi преди 6 години
родител
ревизия
47dba8bf83
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1 1
      packages/@uppy/dashboard/src/components/FileItem.js
  2. 1 1
      packages/@uppy/dashboard/src/components/FileItemProgress.js

+ 1 - 1
packages/@uppy/dashboard/src/components/FileItem.js

@@ -15,7 +15,6 @@ function FileItemProgressWrapper (props) {
   }
   }
 
 
   if (props.isUploaded ||
   if (props.isUploaded ||
-      !props.individualCancellation ||
       (props.hidePauseResumeCancelButtons && !props.error)) {
       (props.hidePauseResumeCancelButtons && !props.error)) {
     return <div class="uppy-DashboardItem-progressIndicator">
     return <div class="uppy-DashboardItem-progressIndicator">
       <FileItemProgress
       <FileItemProgress
@@ -38,6 +37,7 @@ function FileItemProgressWrapper (props) {
       : <FileItemProgress
       : <FileItemProgress
         progress={props.file.progress.percentage}
         progress={props.file.progress.percentage}
         fileID={props.file.id}
         fileID={props.file.id}
+        individualCancellation={props.individualCancellation}
         hidePauseResumeCancelButtons={props.hidePauseResumeCancelButtons}
         hidePauseResumeCancelButtons={props.hidePauseResumeCancelButtons}
       />
       />
     }
     }

+ 1 - 1
packages/@uppy/dashboard/src/components/FileItemProgress.js

@@ -19,7 +19,7 @@ module.exports = (props) => {
           stroke-dashoffset={circleLength - (circleLength / 100 * props.progress)}
           stroke-dashoffset={circleLength - (circleLength / 100 * props.progress)}
         />
         />
       </g>
       </g>
-      {!props.hidePauseResumeCancelButtons && props.individualCancellation ? (
+      {!props.hidePauseResumeCancelButtons ? (
         <g>
         <g>
           <polygon class="play" transform="translate(3, 3)" points="12 20 12 10 20 15" />
           <polygon class="play" transform="translate(3, 3)" points="12 20 12 10 20 15" />
           <g class="pause" transform="translate(14.5, 13)">
           <g class="pause" transform="translate(14.5, 13)">