+ _converFile method

Author: RubaXa

lib/FileAPI.Form.js

@@ -4,10 +4,10 @@
 	"use strict";
 
 	var
-		  encode = window.encodeURIComponent
-		, document = window.document
+		  document = window.document
 		, FormData = window.FormData
 		, Form = function (){ this.items = []; }
+		, encodeURIComponent = window.encodeURIComponent
 	;
 
 
@@ -90,31 +90,33 @@
 				if( file.file ){
 					data.type = file.file;
 				}
+
 				if( file.blob.toBlob ){
 				    // canvas
 					queue.inc();
-					file.blob.toBlob(function (blob){
+					_converFile(file, function (file, blob){
 						data.name = file.name;
 						data.file = blob;
 						data.size = blob.length;
 						data.type = file.type;
 						queue.next();
-					}, 'image/png');
+					});
 				}
 				else if( file.file ){
-				    //file
+				    // file
 					data.name = file.blob.name;
 					data.file = file.blob;
 					data.size = file.blob.size;
 					data.type = file.type;
 				}
 				else {
 				    // additional data
-				    if (!data.params) {
+				    if( !data.params ){
 				        data.params = [];
 				    }
-				    data.params.push(encodeURIComponent(file.name) + "=" + encodeURIComponent(file.blob));
+				    data.params.push(encodeURIComponent(file.name) +"="+ encodeURIComponent(file.blob));
 				}
+
 				data.start = -1;
 				data.end = -1;
 				data.retry = 0;
@@ -123,41 +125,75 @@
 
 		toFormData: function (fn){
 			this._to(new FormData, fn, function (file, data, queue){
-				if( file.file ){
-					data.append('_'+file.name, file.file);
-				}
-
 				if( file.blob && file.blob.toBlob ){
 					queue.inc();
-					file.blob.toBlob(function (blob){
+					_converFile(file, function (file, blob){
 						data.append(file.name, blob, file.file);
 						queue.next();
-					}, 'image/png');
+					});
 				}
 				else if( file.file ){
 					data.append(file.name, file.blob, file.file);
 				}
 				else {
 					data.append(file.name, file.blob);
 				}
+
+				if( file.file ){
+					data.append('_'+file.name, file.file);
+				}
 			});
 		},
 
 
 		toMultipartData: function (fn){
 			this._to([], fn, function (file, data, queue, boundary){
-				data.push(
-					  '--_' + boundary + ('\r\nContent-Disposition: form-data; name="'+ file.name +'"'+ (file.file ? '; filename="'+ encode(file.file) +'"' : '')
-					+ (file.file ? '\r\nContent-Type: '+ (file.type || 'application/octet-stream') : '')
-					+ '\r\n'
-					+ '\r\n'+ (file.file ? file.blob : encode(file.blob))
-					+ '\r\n')
-				);
+				_converFile(file, function (file, blob){
+					data.push(
+						  '--_' + boundary + ('\r\nContent-Disposition: form-data; name="'+ file.name +'"'+ (file.file ? '; filename="'+ encodeURIComponent(file.file) +'"' : '')
+						+ (file.file ? '\r\nContent-Type: '+ (file.type || 'application/octet-stream') : '')
+						+ '\r\n'
+						+ '\r\n'+ (file.file ? blob : encodeURIComponent(blob))
+						+ '\r\n')
+					);
+				});
 			}, api.expando);
 		}
 	};
 
 
+	function _converFile(file, fn){
+		var blob = file.blob, filename = file.file;
+
+		if( filename ){
+			var
+				  mime = { 'image/jpeg': '.jpe?g', 'image/png': '.png' }
+				, type = mime[file.type] ? file.type : 'image/png'
+				, ext  = mime[type] || '.png'
+				, quality = blob.quality || 1
+			;
+
+			if( !filename.match(new RegExp(ext+'$', 'i')) ){
+				filename += ext.replace('?', '');
+			}
+
+			file.file = filename;
+			file.type = type;
+
+			if( blob.toBlob ){
+				blob.toBlob(function (blob){
+					fn(file, blob);
+				}, type, quality);
+			}
+			else {
+				blob = api.toBinaryString(blob.toDataURL(type, quality));
+			}
+		}
+
+		return	blob;
+	}
+
+
 	// @export
 	api.Form = Form;
 })(FileAPI, window);