Skip to content

Commit f231fe3

Browse files
committed
refactor(tpl): separate progressive/non-progressive paste handler
1 parent b2b7983 commit f231fe3

File tree

1 file changed

+20
-19
lines changed

1 file changed

+20
-19
lines changed

src/tpl/frontend/index.js

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -627,18 +627,16 @@
627627
if (!dataTransferItems) {
628628
return false;
629629
}
630-
var hasDir = false;
631630
var items = Array.prototype.slice.call(dataTransferItems);
632631
if (items.length && items[0].webkitGetAsEntry) {
633632
for (var i = 0, len = items.length; i < len; i++) {
634633
var entry = items[i].webkitGetAsEntry();
635634
if (entry && entry.isDirectory) {
636-
hasDir = true;
637-
break;
635+
return true;
638636
}
639637
}
640638
}
641-
return hasDir;
639+
return false;
642640
}
643641

644642
function switchToFileMode() {
@@ -967,19 +965,7 @@
967965
dragDropEl.addEventListener('drop', onDrop);
968966
}
969967

970-
function enableAddPaste(uploadProgressively) {
971-
if (!uploadProgressively) {
972-
document.documentElement.addEventListener('paste', function (e) {
973-
var data = e.clipboardData;
974-
if (data && data.files && data.files.length) {
975-
switchToFileMode();
976-
fileInput.files = data.files;
977-
form.submit();
978-
}
979-
});
980-
return;
981-
}
982-
968+
function enableAddPasteProgressively(uploadProgressively) {
983969
var typeTextPlain = 'text/plain';
984970
var createTextFile;
985971
var textFilename = 'text.txt';
@@ -1104,11 +1090,26 @@
11041090
});
11051091
}
11061092

1093+
function enableAddPasteFormSubmit() {
1094+
document.documentElement.addEventListener('paste', function (e) {
1095+
var data = e.clipboardData;
1096+
if (data && data.files && data.files.length) {
1097+
switchToFileMode();
1098+
fileInput.files = data.files;
1099+
form.submit();
1100+
}
1101+
});
1102+
}
1103+
11071104
enableAddDirFile();
11081105
var uploadProgressively = enableUploadProgress();
1109-
enableFormUploadProgress(uploadProgressively);
1106+
if (uploadProgressively) {
1107+
enableFormUploadProgress(uploadProgressively);
1108+
enableAddPasteProgressively(uploadProgressively);
1109+
} else {
1110+
enableAddPasteFormSubmit();
1111+
}
11101112
enableAddDragDrop(uploadProgressively);
1111-
enableAddPaste(uploadProgressively);
11121113
}
11131114

11141115
function enableNonRefreshDelete() {

0 commit comments

Comments
 (0)