Merge branch 'dev' of https://github.com/mailru/FileAPI into dev

Conflicts:	lib/FileAPI.core.js

Author: Vladimir Demidov

FileAPI.min.js

@@ -529,6 +529,7 @@ All the other codes - fatal error, user's involvement is recommend.
 header('Access-Control-Allow-Methods: POST, OPTIONS');
 header('Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Range, Content-Disposition, Content-Type'); // and other custom headers
 header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']); // a comma-separated list of domains
+header('Access-Control-Allow-Credentials: true');
 
 if( $_SERVER['REQUEST_METHOD'] == 'OPTIONS' ){
 exit;
@@ -670,11 +671,17 @@ All the other codes - fatal error, user's involvement is recommend.
 
 
 ## Changelog
+ * [#91](https://github.com/mailru/FileAPI/issues/91): replace `new Image` to `FileAPI.newImage`
+ * + FileAPI.withCredentials: true
+ * [#90](https://github.com/mailru/FileAPI/issues/90): Fixed `progress` event
+
+
 ### 1.2.5
  * [#86](https://github.com/mailru/FileAPI/issues/86): Smarter upload recovery
  * [#87](https://github.com/mailru/FileAPI/issues/87): Fixed upload files into browsers that do not support FormData
  * Fixed support "accept" attribute for Flash.
  * Fixed detection of HTML5 support for FireFox 3.6
+ * + FileAPI.html5 option, default "true"
 
 
 ### 1.2.4

README.md

@@ -335,12 +335,14 @@ function onFiles(files){
 }
 
 FileAPI.each(result.images, function (dataURL, name){
-$('<div/>')
-.append('<div><b>'+name+'</b></div>')
-.append($(new Image).attr('src', dataURL))
-.css({ margin: 5, border: '1px dotted #666', padding: 5 })
-.appendTo('body')
-;
+FileAPI.newImage(dataURL, function (err, img){
+$('<div/>')
+.append('<div><b>'+name+'</b></div>')
+.append(img)
+.css({ margin: 5, border: '1px dotted #666', padding: 5 })
+.appendTo('body')
+;
+});
 });
 
 document.getElementById('Log').innerHTML += '<pre style="font-size: 11px;">'+xhr.responseText.substr(0, 200)+'</pre>';

index.php

@@ -23,7 +23,7 @@
 })();
 
 
-if( 1 && api.support.flash && (0 || !api.support.html5 || api.cors && !api.support.cors) ) (function (){
+if( 1 && api.support.flash && (0 || !api.html5 || !api.support.html5 || api.cors && !api.support.cors) ) (function (){
 var
  _attr = api.uid()
 , _retry = 0
@@ -366,12 +366,7 @@
 }, base64, fn);
 }
 else {
-var img = new Image;
-api.event.one(img, 'error abort load', function (evt){
-fn(evt.type != 'load' && evt.type, img);
-img = null;
-});
-img.src = 'data:'+ file.type +';base64,'+ base64;
+api.newImage('data:'+ file.type +';base64,'+ base64, fn);
 }
 })
 });
@@ -644,12 +639,9 @@
 
 
 // Check dataURI support
-var dataURICheck = new Image;
-api.event.one(dataURICheck, 'error load', function (){
-api.support.dataURI = !(dataURICheck.width != 1 || dataURICheck.height != 1);
-dataURICheck = null;
+api.newImage('data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==', function (err, img){
+api.support.dataURI = !(img.width != 1 || img.height != 1);
 flash.init();
 });
-dataURICheck.src = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==';
 })();
 })(FileAPI, window, document);

lib/FileAPI.Flash.js

@@ -140,7 +140,10 @@
 }
 
 xhr.open('POST', url, true);
-xhr.withCredential = "true";
+
+if( api.withCredentials ){
+xhr.withCredentials = "true";
+}
 
 if( !options.headers || !options.headers['X-Requested-With'] ){
 xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');

lib/FileAPI.XHR.js

@@ -19,7 +19,7 @@
 jQuery = window.jQuery,
 
 html5 = !!(File && (FileReader && (window.Uint8Array || FormData || XMLHttpRequest.prototype.sendAsBinary)))
-&& !(/safari\//.test(userAgent) && /windows/i.test(userAgent)), // BugFix: https://github.com/mailru/FileAPI/issues/25
+&& !(/safari\//i.test(userAgent) && !/chrome\//i.test(userAgent) && /windows/i.test(userAgent)), // BugFix: https://github.com/mailru/FileAPI/issues/25
 
 cors = html5 && ('withCredentials' in (new XMLHttpRequest)),
 
@@ -59,9 +59,10 @@
 version: '1.2.5',
 
 cors: false,
+html5: true,
 debug: false,
 pingUrl: false,
-flashAbortTimeout: 0,
+withCredentials: true,
 
 staticPath: './',
 
@@ -104,6 +105,29 @@
 }
 },
 
+/**
+ * Create new image
+ *
+ * @param {String} [src]
+ * @param {Function} [fn] 1. error -- boolean, 2. img -- Image element
+ * @returns {HTMLElement}
+ */
+newImage: function (src, fn){
+var img = document.createElement('img');
+if( fn ){
+api.event.one(img, 'error load', function (evt){
+fn(evt.type == 'error', img);
+img = null;
+});
+}
+img.src = src;
+returnimg;
+},
+
+/**
+ * Get XHR
+ * @returns {XMLHttpRequest}
+ */
 getXHR: function (){
 var xhr;
 
@@ -477,8 +501,7 @@
 }
 else {
 // Created image
-var img = new Image;
-img.src = file.dataURL || file;
+var img = api.newImage(file.dataURL || file);
 api.readAsImage(img, fn, progress);
 }
 },
@@ -740,10 +763,8 @@
 var
  proxyXHR = new api.XHR(options)
 , dataArray = this._getFilesDataArray(options.files)
-, total = 0
-, loaded = 0
+, _total = 0
 , _loaded = 0
-, _part = 1 // part of total size
 , _this = this
 , _nextFile
 , _complete = false
@@ -752,7 +773,7 @@
 
 // calc total size
 _each(dataArray, function (data){
-total += data.size;
+_total += data.size;
 });
 
 // Array of files
@@ -762,7 +783,7 @@
 });
 
 // Set upload status props
-proxyXHR.total= total;
+proxyXHR.total= _total;
 proxyXHR.loaded= 0;
 
 // emit "beforeupload" event
@@ -792,7 +813,7 @@
 _file && options.prepare(_file, _fileOptions);
 
 this._getFormData(_fileOptions, data, function (form){
-if( !loaded ){
+if( !_loaded ){
 // emit "upload" event
 options.upload(proxyXHR, options);
 }
@@ -806,38 +827,39 @@
 
 progress: _file ? function (evt){
 if( !_fileLoaded ){
-loaded += (total * _part * (evt.loaded/evt.total) - _loaded + .5)|0;
-_loaded = loaded;
-
-data.total= evt.total;
-data.loaded= evt.loaded;
-
 // emit "fileprogress" event
-options.fileprogress(evt, _file, xhr, _fileOptions);
+options.fileprogress({
+ type: 'progress'
+, total: data.total = evt.total
+, loaded: data.loaded = evt.loaded
+}, _file, xhr, _fileOptions);
 
 // emit "progress" event
 options.progress({
- type: evt.type
-, total: total
-, loaded: proxyXHR.loaded = loaded
-, lengthComputable: true
+ type: 'progress'
+, total: _total
+, loaded: proxyXHR.loaded = (_loaded + data.size * (evt.loaded/evt.total))|0
 }, _file, xhr, _fileOptions);
 }
 } : noop,
 
 complete: function (err){
+// fixed throttle event
+_fileLoaded = true;
+
 _each(_xhrPropsExport, function (name){
 proxyXHR[name] = xhr[name];
 });
 
-// fixed throttle event
-_fileLoaded = true;
-
 if( _file ){
 data.loaded= data.total;
 
+// emulate 100% "progress"
+this.progress(data);
+
 // bytes loaded
-proxyXHR.loaded = (loaded += (loaded - _loaded) + (total*_part + .5)|0);
+_loaded += data.size; // data.size != data.total, it's desirable fix this
+proxyXHR.loaded = _loaded;
 
 // emit "filecomplete" event
 options.filecomplete(err, xhr, _file, _fileOptions);
@@ -849,9 +871,6 @@
 })); // xhr
 
 
-// share of file size from the total size
-_part = data.size / total;
-
 // ...
 proxyXHR.abort = function (current){ this.current = current; xhr.abort(); };
 
@@ -872,7 +891,7 @@
 files = api._getFilesDataArray([].concat(files));
 
 _each(files, function (data) {
-total += data.size;
+_total += data.size;
 proxyXHR.files.push(data.file);
 if (first) {
 dataArray.unshift(data);