Skip to content

Commit b2b7983

Browse files
committed
feat(tpl): use dir mode for drop/paste directories.
After this change, even if "Dir contents" is selected, dropping or pasting items with directories will always select "Dir" and use dir mode for uploading.
1 parent 1e281f9 commit b2b7983

File tree

1 file changed

+3
-17
lines changed

1 file changed

+3
-17
lines changed

src/tpl/frontend/index.js

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -662,18 +662,6 @@
662662
}
663663
}
664664

665-
function switchToAnyDirMode() {
666-
if (optActive === optFile) {
667-
if (optDirFile) {
668-
optDirFile.focus();
669-
optDirFile.click();
670-
} else if (optInnerDirFile) {
671-
optInnerDirFile.focus();
672-
optInnerDirFile.click();
673-
}
674-
}
675-
}
676-
677665
function enableAddDirFile() {
678666
var classHidden = 'hidden';
679667
var classActive = 'active';
@@ -953,9 +941,8 @@
953941
// must use progressive upload by JS if has directory
954942
return;
955943
}
956-
var itemsCount = items.length; // save items count earlier, items will be lost after calling FileSystemFileEntry.file()
957944
itemsToFiles(items, function (files) {
958-
itemsCount > 1 ? switchToDirMode() : switchToAnyDirMode();
945+
switchToDirMode();
959946
uploadProgressively(files);
960947
});
961948
} else {
@@ -1087,8 +1074,7 @@
10871074
}
10881075

10891076
var items = data.items;
1090-
var itemsCount = items.length; // save items count earlier, items will be lost after calling FileSystemFileEntry.file()
1091-
if (!items || !itemsCount) {
1077+
if (!items || !items.length) {
10921078
generatePastedFiles(data);
10931079
return;
10941080
}
@@ -1109,7 +1095,7 @@
11091095
}
11101096
// pasted real files, not image binary
11111097
if (hasDir) {
1112-
itemsCount > 1 ? switchToDirMode() : switchToAnyDirMode();
1098+
switchToDirMode();
11131099
} else {
11141100
switchToFileMode();
11151101
}

0 commit comments

Comments
 (0)