c

Author: dolymood

src/flow/flow.js

@@ -32,6 +32,12 @@
  * Supported by browser?
  * @type {boolean}
  */
+
+// ie10 +
+// ie 不能通过formdata上传0kb的文件
+// 所以还是采用传统的方式
+var ie10 = window.navigator.msPointerEnabled;
+
 this.support = (
 typeof File !== 'undefined' &&
 typeof Blob !== 'undefined' &&
@@ -40,8 +46,10 @@
 !!Blob.prototype.slice || !!Blob.prototype.webkitSlice || !!Blob.prototype.mozSlice ||
 false
 ) // slicing files support
+&& !ie10
 );
 
+
 if (!this.support) {
 return ;
 }
@@ -540,7 +548,8 @@
 totalDone += file.progress() * file.size;
 totalSize += file.size;
 });
-return totalSize > 0 ? totalDone / totalSize : 1;
+return totalSize > 0 ? totalDone / totalSize :
+this.isComplete() ? 1 : 0;
 },
 
 /**
@@ -1035,7 +1044,8 @@
 totalDone += file.progress() * file.size;
 totalSize += file.size;
 });
-return totalSize > 0 ? totalDone / totalSize : 1;
+return totalSize > 0 ? totalDone / totalSize : 
+this.isComplete() ? 1 : 0;;
 },
 
 /**

src/flow/fusty-flow.js

@@ -319,7 +319,7 @@ function FustyFlowFile(flowObj, element) {
 $.error = true;
 $.maxsized = true;
 $.abort();
-$.flowObj.fire('fileError', $, error);
+$.flowObj.fire('fileError', $, 'upload err');
 $.flowObj.upload();
 return;
 }

src/flow/sample/app.js

@@ -21,7 +21,7 @@ require([
 
 .run(['$rootScope', function($rootScope) {
 
-$rootScope.target = ''
+$rootScope.target = '/'
 $rootScope.flowObj = {
 flow: null
 };
@@ -44,10 +44,11 @@ require([
 };
 $rootScope.fileSuccess = function($file, $message) {
 var id;
-$message = angular.fromJson($message);
+// $message = angular.fromJson($message);
 // do ...
 };
 var parse2N = function(num) {
+if (!num) return '0'
 var k1, k2;
 k1 = 1024 * 1024 * 1024;
 k2 = 1024 * 1024;