From 8c920e77ea72b89246ff7479a0ae902b55b6c5c4 Mon Sep 17 00:00:00 2001
From: meilixie <xiemeilihcy@gmail.com>
Date: Fri, 14 Aug 2015 14:19:36 +0800
Subject: [PATCH 1/2] delete extra bindCancelUpload event

---
 demo/js/main.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/demo/js/main.js b/demo/js/main.js
index 0a8b9f8d..3bb72fa1 100644
--- a/demo/js/main.js
+++ b/demo/js/main.js
@@ -44,14 +44,11 @@ $(function() {
                 if (up.runtime === 'html5' && chunk_size) {
                     progress.setChunkProgess(chunk_size);
                 }
-                progress.bindUploadCancel(up);
             },
             'UploadProgress': function(up, file) {
                 var progress = new FileProgress(file, 'fsUploadProgress');
                 var chunk_size = plupload.parseSize(this.getOption('chunk_size'));
                 progress.setProgress(file.percent + "%", file.speed, chunk_size);
-                progress.bindUploadCancel(up);
-
             },
             'UploadComplete': function() {
                 $('#success').show();

From 58149c4acae845a2ddb8e3fda595b26e30f9a003 Mon Sep 17 00:00:00 2001
From: meilixie <xiemeilihcy@gmail.com>
Date: Fri, 14 Aug 2015 14:21:35 +0800
Subject: [PATCH 2/2] fixed when cancel upload then show more btn error

---
 demo/js/ui.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/demo/js/ui.js b/demo/js/ui.js
index 54a5e7be..a18a48d5 100644
--- a/demo/js/ui.js
+++ b/demo/js/ui.js
@@ -115,11 +115,13 @@ FileProgress.prototype.setChunkProgess = function(chunk_size) {
         col.append(progressBarWrapper);
         progressBarChunk.append(col);
     }
-    this.fileProgressWrapper.find('td>div').append(viewProgess);
 
+    if(!this.fileProgressWrapper.find('td:eq(2) .btn-default').length){
+        this.fileProgressWrapper.find('td>div').append(viewProgess);
+    }
     progressBarChunkTr.hide().find('td').append(progressBarChunk);
-
     progressBarChunkTr.insertAfter(this.fileProgressWrapper);
+
 };
 
 FileProgress.prototype.setProgress = function(percentage, speed, chunk_size) {
@@ -131,6 +133,9 @@ FileProgress.prototype.setProgress = function(percentage, speed, chunk_size) {
     var size = plupload.formatSize(uploaded).toUpperCase();
     var formatSpeed = plupload.formatSize(speed).toUpperCase();
     var progressbar = this.fileProgressWrapper.find('td .progress').find('.progress-bar-info');
+    if (this.fileProgressWrapper.find('.status').text() === '取消上传'){
+        return;
+    }
     this.fileProgressWrapper.find('.status').text("已上传: " + size + " 上传速度： " + formatSpeed + "/s");
     percentage = parseInt(percentage, 10);
     if (file.status !== plupload.DONE && percentage === 100) {
@@ -373,13 +378,11 @@ FileProgress.prototype.setStatus = function(status, isUploading) {
 FileProgress.prototype.bindUploadCancel = function(up) {
     var self = this;
     if (up) {
-
         self.fileProgressWrapper.find('td:eq(2) .progressCancel').on('click', function(){
             self.setCancelled(false);
             self.setStatus("取消上传");
             self.fileProgressWrapper.find('.status').css('left', '0');
             up.removeFile(self.file);
-            return true;
         });
     }