can cancel paused

tencentyun · Jul 13, 2017 · 46e9e87 · 46e9e87
1 parent 3ea0130
commit 46e9e87
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -15275,7 +15275,7 @@ var initTask = function (cos) {
         var task = tasks[id];
         var waiting = task && task.state === 'waiting';
         var running = task && (task.state === 'checking' || task.state === 'uploading');
-        if (waiting || running) {
+        if (waiting || running || switchToState === 'canceled' && task.state === 'paused') {
             if (switchToState === 'paused' && task.params.Body && typeof task.params.Body.pipe === 'function') {
                 console.error('stream not support pause');
                 return;
@@ -15287,7 +15287,7 @@ var initTask = function (cos) {
                 uploadingFileCount--;
                 startNextTask(cos);
             }
-            if (switchToState === 'cancel') {
+            if (switchToState === 'canceled') {
                 delete task.params;
                 delete task.callback;
             }

diff --git a/dist/cos-js-sdk-v5.min.js b/dist/cos-js-sdk-v5.min.js
diff --git a/src/task.js b/src/task.js
@@ -56,7 +56,7 @@ var initTask = function (cos) {
         var task = tasks[id];
         var waiting = task && task.state === 'waiting';
         var running = task && (task.state === 'checking' || task.state === 'uploading');
-        if (waiting || running) {
+        if (waiting || running || (switchToState === 'canceled' && task.state === 'paused')) {
             if (switchToState === 'paused' && task.params.Body && typeof task.params.Body.pipe === 'function') {
                 console.error('stream not support pause');
                 return;
@@ -68,7 +68,7 @@ var initTask = function (cos) {
                 uploadingFileCount--;
                 startNextTask(cos);
             }
-            if (switchToState === 'cancel') {
+            if (switchToState === 'canceled') {
                 delete task.params;
                 delete task.callback;
             }