Skip to content

Commit 46a8e09

Browse files
RubaXaRubaXa
committed
* d'n'd errors
1 parent 3f1dae7 commit 46a8e09

5 files changed

Lines changed: 51 additions & 27 deletions

File tree

‎dist/FileAPI.html5.js‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -773,10 +773,15 @@
773773

774774
_each((entrySupport ? dataTransfer.items : dataTransfer.files) || [], function (item){
775775
queue.inc();
776+
776777
try {
777778
if( entrySupport ){
778779
_readEntryAsFiles(item, function (err, entryFiles){
779-
!err && files.push.apply(files, entryFiles);
780+
if( err ){
781+
api.log('[err] getDropFiles:', err);
782+
} else {
783+
files.push.apply(files, entryFiles);
784+
}
780785
queue.next();
781786
});
782787
}
@@ -789,7 +794,7 @@
789794
}
790795
catch( err ){
791796
queue.next();
792-
api.log('getDropFiles.error:', err.toString());
797+
api.log('[err] getDropFiles: ', err);
793798
}
794799
});
795800

@@ -1529,17 +1534,17 @@
15291534
function _readEntryAsFiles(entry, callback){
15301535
if( !entry ){
15311536
// error
1532-
callback('empty_entry');
1537+
callback('invalid entry');
15331538
}
15341539
else if( entry.isFile ){
15351540
// Read as file
15361541
entry.file(function(file){
15371542
// success
15381543
file.fullPath = entry.fullPath;
15391544
callback(false, [file]);
1540-
}, function (){
1545+
}, function (err){
15411546
// error
1542-
callback('entry_file');
1547+
callback('FileError.code: '+err.code);
15431548
});
15441549
}
15451550
else if( entry.isDirectory ){
@@ -1549,7 +1554,10 @@
15491554
// success
15501555
api.afor(entries, function (next, entry){
15511556
_readEntryAsFiles(entry, function (err, files){
1552-
if( !err ){
1557+
if( err ){
1558+
api.log(err);
1559+
}
1560+
else {
15531561
result = result.concat(files);
15541562
}
15551563

@@ -1561,9 +1569,9 @@
15611569
}
15621570
});
15631571
});
1564-
}, function (){
1572+
}, function (err){
15651573
// error
1566-
callback('directory_reader');
1574+
callback('directory_reader: ' + err);
15671575
});
15681576
}
15691577
else {

‎dist/FileAPI.html5.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/FileAPI.js‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -773,10 +773,15 @@
773773

774774
_each((entrySupport ? dataTransfer.items : dataTransfer.files) || [], function (item){
775775
queue.inc();
776+
776777
try {
777778
if( entrySupport ){
778779
_readEntryAsFiles(item, function (err, entryFiles){
779-
!err && files.push.apply(files, entryFiles);
780+
if( err ){
781+
api.log('[err] getDropFiles:', err);
782+
} else {
783+
files.push.apply(files, entryFiles);
784+
}
780785
queue.next();
781786
});
782787
}
@@ -789,7 +794,7 @@
789794
}
790795
catch( err ){
791796
queue.next();
792-
api.log('getDropFiles.error:', err.toString());
797+
api.log('[err] getDropFiles: ', err);
793798
}
794799
});
795800

@@ -1529,17 +1534,17 @@
15291534
function _readEntryAsFiles(entry, callback){
15301535
if( !entry ){
15311536
// error
1532-
callback('empty_entry');
1537+
callback('invalid entry');
15331538
}
15341539
else if( entry.isFile ){
15351540
// Read as file
15361541
entry.file(function(file){
15371542
// success
15381543
file.fullPath = entry.fullPath;
15391544
callback(false, [file]);
1540-
}, function (){
1545+
}, function (err){
15411546
// error
1542-
callback('entry_file');
1547+
callback('FileError.code: '+err.code);
15431548
});
15441549
}
15451550
else if( entry.isDirectory ){
@@ -1549,7 +1554,10 @@
15491554
// success
15501555
api.afor(entries, function (next, entry){
15511556
_readEntryAsFiles(entry, function (err, files){
1552-
if( !err ){
1557+
if( err ){
1558+
api.log(err);
1559+
}
1560+
else {
15531561
result = result.concat(files);
15541562
}
15551563

@@ -1561,9 +1569,9 @@
15611569
}
15621570
});
15631571
});
1564-
}, function (){
1572+
}, function (err){
15651573
// error
1566-
callback('directory_reader');
1574+
callback('directory_reader: ' + err);
15671575
});
15681576
}
15691577
else {

‎dist/FileAPI.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/FileAPI.core.js‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -682,10 +682,15 @@
682682

683683
_each((entrySupport ? dataTransfer.items : dataTransfer.files) || [], function (item){
684684
queue.inc();
685+
685686
try {
686687
if( entrySupport ){
687688
_readEntryAsFiles(item, function (err, entryFiles){
688-
!err && files.push.apply(files, entryFiles);
689+
if( err ){
690+
api.log('[err] getDropFiles:', err);
691+
} else {
692+
files.push.apply(files, entryFiles);
693+
}
689694
queue.next();
690695
});
691696
}
@@ -698,7 +703,7 @@
698703
}
699704
catch( err ){
700705
queue.next();
701-
api.log('getDropFiles.error:', err.toString());
706+
api.log('[err] getDropFiles: ', err);
702707
}
703708
});
704709

@@ -1438,17 +1443,17 @@
14381443
function _readEntryAsFiles(entry, callback){
14391444
if( !entry ){
14401445
// error
1441-
callback('empty_entry');
1446+
callback('invalid entry');
14421447
}
14431448
else if( entry.isFile ){
14441449
// Read as file
14451450
entry.file(function(file){
14461451
// success
14471452
file.fullPath = entry.fullPath;
14481453
callback(false, [file]);
1449-
}, function (){
1454+
}, function (err){
14501455
// error
1451-
callback('entry_file');
1456+
callback('FileError.code: '+err.code);
14521457
});
14531458
}
14541459
else if( entry.isDirectory ){
@@ -1458,7 +1463,10 @@
14581463
// success
14591464
api.afor(entries, function (next, entry){
14601465
_readEntryAsFiles(entry, function (err, files){
1461-
if( !err ){
1466+
if( err ){
1467+
api.log(err);
1468+
}
1469+
else {
14621470
result = result.concat(files);
14631471
}
14641472

@@ -1470,9 +1478,9 @@
14701478
}
14711479
});
14721480
});
1473-
}, function (){
1481+
}, function (err){
14741482
// error
1475-
callback('directory_reader');
1483+
callback('directory_reader: ' + err);
14761484
});
14771485
}
14781486
else {

0 commit comments

Comments
 (0)