Merge pull request mailru#273 from termi/issue-272

#272 fixed: call reader.readEntries till it return non-empty array

Author: RubaXa

README.md

@@ -1396,6 +1396,11 @@ Button like link.
 ## Changelog
 
 
+### 2.0.10
+<ul>
+<li>#272: fixed `entry.createReader().readEntries`</li>
+</ul>
+
 ### 2.0.9
 <ul>
 <li>#253: fixed `proxyXHR.loaded`</li>

dist/FileAPI.html5.js

@@ -1592,29 +1592,34 @@
 else if( entry.isDirectory ){
 var reader = entry.createReader(), result = [];
 
-reader.readEntries(function(entries){
+var onerror = function() {
+// error
+callback('directory_reader');
+};
+var ondone = function ondone(entries) {
 // success
-api.afor(entries, function (next, entry){
-_readEntryAsFiles(entry, function (err, files){
-if( err ){
-api.log(err);
-}
-else {
-result = result.concat(files);
-}
+if ( entries.length ) {
+api.afor(entries, function (next, entry){
+_readEntryAsFiles(entry, function (err, files){
+if( !err ){
+result = result.concat(files);
+}
 
-if( next ){
-next();
-}
-else {
-callback(false, result);
-}
+if( next ){
+next();
+}
+else {
+reader.readEntries(ondone, onerror);
+}
+});
 });
-});
-}, function (err){
-// error
-callback('directory_reader: ' + err);
-});
+}
+else {
+callback(false, result);
+}
+};
+
+reader.readEntries(ondone, onerror);
 }
 else {
 _readEntryAsFiles(_getAsEntry(entry), callback);

dist/FileAPI.js

@@ -1592,29 +1592,34 @@
 else if( entry.isDirectory ){
 var reader = entry.createReader(), result = [];
 
-reader.readEntries(function(entries){
+var onerror = function() {
+// error
+callback('directory_reader');
+};
+var ondone = function ondone(entries) {
 // success
-api.afor(entries, function (next, entry){
-_readEntryAsFiles(entry, function (err, files){
-if( err ){
-api.log(err);
-}
-else {
-result = result.concat(files);
-}
+if ( entries.length ) {
+api.afor(entries, function (next, entry){
+_readEntryAsFiles(entry, function (err, files){
+if( !err ){
+result = result.concat(files);
+}
 
-if( next ){
-next();
-}
-else {
-callback(false, result);
-}
+if( next ){
+next();
+}
+else {
+reader.readEntries(ondone, onerror);
+}
+});
 });
-});
-}, function (err){
-// error
-callback('directory_reader: ' + err);
-});
+}
+else {
+callback(false, result);
+}
+};
+
+reader.readEntries(ondone, onerror);
 }
 else {
 _readEntryAsFiles(_getAsEntry(entry), callback);

lib/FileAPI.core.js

@@ -1498,29 +1498,34 @@
 else if( entry.isDirectory ){
 var reader = entry.createReader(), result = [];
 
-reader.readEntries(function(entries){
+var onerror = function() {
+// error
+callback('directory_reader');
+};
+var ondone = function ondone(entries) {
 // success
-api.afor(entries, function (next, entry){
-_readEntryAsFiles(entry, function (err, files){
-if( err ){
-api.log(err);
-}
-else {
-result = result.concat(files);
-}
+if ( entries.length ) {
+api.afor(entries, function (next, entry){
+_readEntryAsFiles(entry, function (err, files){
+if( !err ){
+result = result.concat(files);
+}
 
-if( next ){
-next();
-}
-else {
-callback(false, result);
-}
+if( next ){
+next();
+}
+else {
+reader.readEntries(ondone, onerror);
+}
+});
 });
-});
-}, function (err){
-// error
-callback('directory_reader: ' + err);
-});
+}
+else {
+callback(false, result);
+}
+};
+
+reader.readEntries(ondone, onerror);
 }
 else {
 _readEntryAsFiles(_getAsEntry(entry), callback);