Merge pull request mailru#101 from wingedfox/master

RubaXa · RubaXa · commit f17be829e021 · 2013-06-26T02:02:48.000-07:00
Fixed append after abort
diff --git a/README.md b/README.md
@@ -485,9 +485,16 @@ Client explicitly sets the following headers:
 Any other headers are set by a target browser and are not used by client.
 Library does not provide any facilities to track a file uniqueness across requests, it's left on developer's consideration.
 
-Client recognizes the following response codes:
-* 200, 201 - chunk is successfully saved
-* 416, 500 - recoverable error, library tries to resend chunk 'chunkUploadRetry' times then fails
+Response codes:
+* 200 - last chunk is uploaded
+* 201 - chunk is successfully saved
+* 416 - range is not acceptable error, recoverable
+* 500 - server error, recoverable
+
+For recoverable errors server tries to resend chunk 'chunkUploadRetry' times then fails.
+
+Response headers:
+* X-Last-Known-Byte: int, library tries to resend chunk from the given offset. Applicable to response codes 200 and 416
 
 All the other codes - fatal error, user's involvement is recommend.
 
diff --git a/lib/FileAPI.core.js b/lib/FileAPI.core.js
@@ -62,6 +62,7 @@
 			html5: true,
 			debug: false,
 			pingUrl: false,
+			flashAbortTimeout: 0,
 			withCredentials: true,
 
 			staticPath: './',
@@ -785,6 +786,7 @@
 				// Set upload status props
 				proxyXHR.total	= _total;
 				proxyXHR.loaded	= 0;
+				proxyXHR.filesLeft = dataArray.length;
 
 				// emit "beforeupload"  event
 				options.beforeupload(proxyXHR, options);
@@ -797,6 +799,8 @@
 						, _fileOptions = _simpleClone(options)
 					;
 
+					proxyXHR.filesLeft = dataArray.length;
+
 					if( _file && _file.name === api.expando ){
 						_file = null;
 						api.log('[warn] FileAPI.upload() — called without files')
@@ -872,7 +876,7 @@
 
 
 							// ...
-							proxyXHR.abort = function (current){ this.current = current; xhr.abort(); };
+							proxyXHR.abort = function (current){ dataArray.length = 0; this.current = current; xhr.abort(); };
 
 							// Start upload
 							xhr.send(form);
@@ -900,6 +904,8 @@
 						}
 					});
 
+					proxyXHR.statusText = "";
+
 					if (_complete) {
 						_nextFile.call(_this);
 					}
