master merged

Author: Ilya Lebedev

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,6 +671,8 @@ 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
 
 

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

@@ -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.withCredentials = "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

@@ -63,6 +63,7 @@
 debug: false,
 pingUrl: false,
 flashAbortTimeout: 0,
+withCredentials: true,
 
 staticPath: './',
 
@@ -105,6 +106,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;
 
@@ -478,8 +502,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);
 }
 },