浏览代码

restore: Calculate current progress after restoring file state.

Renée Kooi 7 年之前
父节点
当前提交
cdaa99eb75
共有 2 个文件被更改,包括 7 次插入7 次删除
  1. 4 0
      src/plugins/GoldenRetriever/index.js
  2. 3 7
      src/plugins/StatusBar/StatusBar.js

+ 4 - 0
src/plugins/GoldenRetriever/index.js

@@ -168,6 +168,10 @@ module.exports = class GoldenRetriever extends Plugin {
     this.uppy.setState({
       files: updatedFiles
     })
+
+    // Files have changed--make sure the progress is accurate.
+    this.uppy.calculateTotalProgress()
+
     this.uppy.emit('restored', this.savedPluginData)
 
     if (obsoleteBlobs.length) {

+ 3 - 7
src/plugins/StatusBar/StatusBar.js

@@ -15,10 +15,6 @@ const STATE_POSTPROCESSING = 'postprocessing'
 const STATE_COMPLETE = 'complete'
 
 function getUploadingState (props, files) {
-  // if (props.error) {
-  //   return STATE_ERROR
-  // }
-
   if (props.isAllErrored) {
     return STATE_ERROR
   }
@@ -198,9 +194,9 @@ const ProgressBarError = ({ error, retryAll, i18n }) => {
     <div class="UppyStatusBar-content" role="alert">
         <strong>${i18n('uploadFailed')}.</strong>
         <span>${i18n('pleasePressRetry')}</span>
-        <span class="UppyStatusBar-details" 
-              data-balloon="${error}" 
-              data-balloon-pos="up" 
+        <span class="UppyStatusBar-details"
+              data-balloon="${error}"
+              data-balloon-pos="up"
               data-balloon-length="large">?</span>
       </div>
   `