refactor(defaultTheme): refine enhanceUpload()

Author: marjune163

src/tpl/defaultTheme/frontend/index.js

@@ -432,22 +432,16 @@
 
 	function enhanceUpload() {
 		var upload = document.body.querySelector('.upload');
-		if (!upload) {
-			return;
-		}
+		if (!upload) return;
+
 		var form = upload.querySelector('form');
-		if (!form) {
-			return;
-		}
+		if (!form) return;
+
 		var fileInput = form.querySelector('.file');
-		if (!fileInput) {
-			return;
-		}
+		if (!fileInput) return;
 
 		var uploadType = document.body.querySelector('.upload-type');
-		if (!uploadType) {
-			return;
-		}
+		if (!uploadType) return;
 
 		var file = 'file';
 		var dirFile = 'dirfile';
@@ -546,45 +540,28 @@
 			}
 		} else {
 			itemsToFiles = function (dataTransferItems, canMkdir, onDone, onLacksMkdir) {
-				function entriesToFiles(entries, files, onLevelDone) {
-					var len = entries.length;
-					var cb = 0;
-					if (!len) return onLevelDone();
-
-					function increaseCb() {
-						cb++;
-						if (cb === len) {
-							onLevelDone();
-						}
-					}
-
-					function dirReaderToFiles(dirReader, files, onAllRead) {
-						dirReader.readEntries(function (subEntries) {
-							if (!subEntries.length) return onAllRead();
-							entriesToFiles(subEntries, files, function () {
-								dirReaderToFiles(dirReader, files, onAllRead);
-							});
-						}, onAllRead);
-					}
-
-					entries.forEach(function (entry) {
-						if (entry.isFile) {
-							var relativePath = entry.fullPath;
-							if (relativePath[0] === '/') {
-								relativePath = relativePath.substring(1);
+				function entriesToFiles(entries, files) {
+					return Promise.all(entries.map(function (entry) {
+						return new Promise(function (resolve) {
+							if (entry.isFile) {
+								var relativePath = entry.fullPath;
+								if (relativePath[0] === '/') {
+									relativePath = relativePath.slice(1);
+								}
+								entry.file(function (file) {
+									files.push({file: file, relativePath: relativePath});
+									resolve();
+								}, function (err) {
+									logError(err);
+									resolve()
+								});
+							} else if (entry.isDirectory) {
+								entry.createReader().readEntries(function (subEntries) {
+									entriesToFiles(subEntries, files).then(resolve);
+								});
 							}
-							entry.file(function (file) {
-								files.push({file: file, relativePath: relativePath});
-								increaseCb();
-							}, function (err) {
-								increaseCb();
-								logError(err);
-							});
-						} else if (entry.isDirectory) {
-							var dirReader = entry.createReader();
-							dirReaderToFiles(dirReader, files, increaseCb);
-						}
-					});
+						})
+					}));
 				}
 
 				var files = [];
@@ -613,7 +590,7 @@
 					}
 				}
 
-				entriesToFiles(entries, files, function () {
+				entriesToFiles(entries, files).then(function () {
 					onDone(files, hasDir);
 				});
 			}