v2.0.11: fixed Drag'n'Drop

Author: RubaXa

dist/FileAPI.html5.js

@@ -1,4 +1,4 @@
-/*! FileAPI 2.0.10 - BSD | git://github.com/mailru/FileAPI.git
+/*! FileAPI 2.0.11 - BSD | git://github.com/mailru/FileAPI.git
  * FileAPI — a set of javascript tools for working with files. Multiupload, drag'n'drop and chunked file upload. Images: crop, resize and auto orientation by EXIF.
  */
 
@@ -105,6 +105,7 @@
 document = window.document,
 doctype = document.doctype || {},
 userAgent = window.navigator.userAgent,
+safari = /safari\//i.test(userAgent) && !/chrome\//i.test(userAgent),
 
 // https://github.com/blueimp/JavaScript-Load-Image/blob/master/load-image.js#L48
 apiURL = (window.createObjectURL && window) || (window.URL && URL.revokeObjectURL && URL) || (window.webkitURL && webkitURL),
@@ -119,12 +120,14 @@
 jQuery = window.jQuery,
 
 html5 = !!(File && (FileReader && (window.Uint8Array || FormData || XMLHttpRequest.prototype.sendAsBinary)))
-&& !(/safari\//i.test(userAgent) && !/chrome\//i.test(userAgent) && /windows/i.test(userAgent)), // BugFix: https://github.com/mailru/FileAPI/issues/25
+&& !(safari && /windows/i.test(userAgent)), // BugFix: https://github.com/mailru/FileAPI/issues/25
 
 cors = html5 && ('withCredentials' in (new XMLHttpRequest)),
 
 chunked = html5 && !!Blob && !!(Blob.prototype.webkitSlice || Blob.prototype.mozSlice || Blob.prototype.slice),
 
+normalize = ('' + ''.normalize).indexOf('[native code]') > 0,
+
 // https://github.com/blueimp/JavaScript-Canvas-to-Blob
 dataURLtoBlob = window.dataURLtoBlob,
 
@@ -280,7 +283,7 @@
  * FileAPI (core object)
  */
 api = {
-version: '2.0.10',
+version: '2.0.11',
 
 cors: false,
 html5: true,
@@ -795,28 +798,84 @@
 getDropFiles: function (evt, callback){
 var
  files = []
+, all = []
+, items
 , dataTransfer = _getDataTransfer(evt)
-, entrySupport = _isArray(dataTransfer.items) && dataTransfer.items[0] && _getAsEntry(dataTransfer.items[0])
-, queue = api.queue(function (){ callback(files); })
+, transFiles = dataTransfer.files
+, transItems = dataTransfer.items
+, entrySupport = _isArray(transItems) && transItems[0] && _getAsEntry(transItems[0])
+, queue = api.queue(function (){ callback(files, all); })
 ;
 
-_each((entrySupport ? dataTransfer.items : dataTransfer.files) || [], function (item){
+if( entrySupport ){
+if( normalize && transFiles ){
+var
+i = transFiles.length
+, file
+, entry
+;
+
+items = new Array(i);
+while( i-- ){
+file = transFiles[i];
+
+try {
+entry = _getAsEntry(transItems[i]);
+}
+catch( err ){
+api.log('[err] getDropFiles: ', err);
+entry = null;
+}
+
+if( _isEntry(entry) ){
+// OSX filesystems use Unicode Normalization Form D (NFD),
+// and entry.file(…) can't read the files with the same names
+if( entry.isDirectory || (entry.isFile && file.name == file.name.normalize('NFC')) ){
+items[i] = entry;
+}
+else {
+items[i] = file;
+}
+}
+else {
+items[i] = file;
+}
+}
+}
+else {
+items = transItems;
+}
+}
+else {
+items = transFiles;
+}
+
+_each(items || [], function (item){
 queue.inc();
 
 try {
-if( entrySupport ){
-_readEntryAsFiles(item, function (err, entryFiles){
+if( entrySupport && _isEntry(item) ){
+_readEntryAsFiles(item, function (err, entryFiles, allEntries){
 if( err ){
 api.log('[err] getDropFiles:', err);
 } else {
 files.push.apply(files, entryFiles);
 }
+all.push.apply(all, allEntries);
+
 queue.next();
 });
 }
 else {
-_isRegularFile(item, function (yes){
-yes && files.push(item);
+_isRegularFile(item, function (yes, err){
+if( yes ){
+files.push(item);
+}
+else {
+item.error = err;
+}
+all.push(item);
+
 queue.next();
 });
 }
@@ -1537,26 +1596,29 @@
 
 function _isRegularFile(file, callback){
 // http://stackoverflow.com/questions/8856628/detecting-folders-directories-in-javascript-filelist-objects
-if( !file.type && (file.size % 4096) === 0 && (file.size <= 102400) ){
+if( !file.type && (safari || ((file.size % 4096) === 0 && (file.size <= 102400))) ){
 if( FileReader ){
 try {
-var Reader = new FileReader();
+var reader = new FileReader();
 
-_one(Reader, _readerEvents, function (evt){
+_one(reader, _readerEvents, function (evt){
 var isFile = evt.type != 'error';
-callback(isFile);
 if( isFile ){
-Reader.abort();
+reader.abort();
+callback(isFile);
+}
+else {
+callback(false, reader.error);
 }
 });
 
-Reader.readAsDataURL(file);
+reader.readAsDataURL(file);
 } catch( err ){
-callback(false);
+callback(false, err);
 }
 }
 else {
-callback(null);
+callback(null, new Error('FileReader is not supported'));
 }
 }
 else {
@@ -1565,6 +1627,11 @@
 }
 
 
+function _isEntry(item){
+return item && (item.isFile || item.isDirectory);
+}
+
+
 function _getAsEntry(item){
 var entry;
 if( item.getAsEntry ){ entry = item.getAsEntry(); }
@@ -1576,34 +1643,52 @@
 function _readEntryAsFiles(entry, callback){
 if( !entry ){
 // error
-callback('invalid entry');
+var err = new Error('invalid entry');
+entry = new Object(entry);
+entry.error = err;
+callback(err.message, [], [entry]);
 }
 else if( entry.isFile ){
 // Read as file
-entry.file(function(file){
+entry.file(function (file){
 // success
 file.fullPath = entry.fullPath;
-callback(false, [file]);
+callback(false, [file], [file]);
 }, function (err){
 // error
-callback('FileError.code: '+err.code);
+entry.error = err;
+callback('FileError.code: ' + err.code, [], [entry]);
 });
 }
 else if( entry.isDirectory ){
-var reader = entry.createReader(), result = [];
+var
+reader = entry.createReader()
+, firstAttempt = true
+, files = []
+, all = [entry]
+;
 
-var onerror = function() {
+var onerror = function (err){
 // error
-callback('directory_reader');
+entry.error = err;
+callback('DirectoryError.code: ' + err.code, files, all);
 };
-var ondone = function ondone(entries) {
+var ondone = function ondone(entries){
+if( firstAttempt ){
+firstAttempt = false;
+if( !entries.length ){
+entry.error = new Error('directory is empty');
+}
+}
+
 // success
-if ( entries.length ) {
+if( entries.length ){
 api.afor(entries, function (next, entry){
-_readEntryAsFiles(entry, function (err, files){
+_readEntryAsFiles(entry, function (err, entryFiles, allEntries){
 if( !err ){
-result = result.concat(files);
+files = files.concat(entryFiles);
 }
+all = all.concat(allEntries);
 
 if( next ){
 next();
@@ -1615,7 +1700,7 @@
 });
 }
 else {
-callback(false, result);
+callback(false, files, all);
 }
 };
 
@@ -1740,8 +1825,8 @@
 _type = 0;
 onHover.call(evt[currentTarget], false, evt);
 
-api.getDropFiles(evt, function (files){
-onDrop.call(evt[currentTarget], files, evt);
+api.getDropFiles(evt, function (files, all){
+onDrop.call(evt[currentTarget], files, all, evt);
 });
 });
 }
@@ -2533,7 +2618,13 @@
 });
 
 this.each(function (file){
-next(file, data, queue, arg);
+try{
+next(file, data, queue, arg);
+}
+catch( err ){
+api.log('FileAPI.Form._to: ' + err.message);
+complete(err);
+}
 });
 
 queue.check();
@@ -2761,9 +2852,14 @@
 var _this = this, options = this.options;
 
 FormData.toData(function (data){
-// Start uploading
-options.upload(options, _this);
-_this._send.call(_this, options, data);
+if( data instanceof Error ){
+_this.end(0, data.message);
+}
+else{
+// Start uploading
+options.upload(options, _this);
+_this._send.call(_this, options, data);
+}
 }, options);
 },