Skip to content

Commit e1bddf4

Browse files
committed
refactor(tpl): reorder inner functions of enhanceUpload()
Exchange execution order for `enableUploadProgress` and `enableAddDragDrop`.
1 parent c7ecd8f commit e1bddf4

File tree

2 files changed

+88
-88
lines changed

2 files changed

+88
-88
lines changed

src/tpl/asset/main.js

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -531,53 +531,6 @@
531531
});
532532
}
533533

534-
function enableAddDragDrop() {
535-
function onDragEnterOver(e) {
536-
e.stopPropagation();
537-
e.preventDefault();
538-
addClass(e.currentTarget, 'dragging');
539-
}
540-
541-
function onDragLeave(e) {
542-
if (e.target === e.currentTarget) {
543-
removeClass(e.currentTarget, 'dragging');
544-
}
545-
}
546-
547-
function onDrop(e) {
548-
e.stopPropagation();
549-
e.preventDefault();
550-
removeClass(e.currentTarget, 'dragging');
551-
fileInput.value = '';
552-
553-
if (!e.dataTransfer || !e.dataTransfer.files || !e.dataTransfer.files.length) {
554-
return;
555-
}
556-
557-
var items = Array.prototype.slice.call(e.dataTransfer.items);
558-
if (items && items.length && items[0].webkitGetAsEntry) {
559-
for (var i = 0, len = items.length; i < len; i++) {
560-
var entry = items[i].webkitGetAsEntry();
561-
if (entry && entry.isDirectory) {
562-
return;
563-
}
564-
}
565-
}
566-
567-
if (optFile && optActive !== optFile) {
568-
optFile.focus();
569-
optFile.click();
570-
}
571-
572-
fileInput.files = e.dataTransfer.files;
573-
}
574-
575-
upload.addEventListener('dragenter', onDragEnterOver, false);
576-
upload.addEventListener('dragover', onDragEnterOver, false);
577-
upload.addEventListener('dragleave', onDragLeave, false);
578-
upload.addEventListener('drop', onDrop, false);
579-
}
580-
581534
function enableUploadProgress() { // also fix Safari upload filename has no path info
582535
if (!FormData) {
583536
return;
@@ -646,9 +599,56 @@
646599
});
647600
}
648601

602+
function enableAddDragDrop() {
603+
function onDragEnterOver(e) {
604+
e.stopPropagation();
605+
e.preventDefault();
606+
addClass(e.currentTarget, 'dragging');
607+
}
608+
609+
function onDragLeave(e) {
610+
if (e.target === e.currentTarget) {
611+
removeClass(e.currentTarget, 'dragging');
612+
}
613+
}
614+
615+
function onDrop(e) {
616+
e.stopPropagation();
617+
e.preventDefault();
618+
removeClass(e.currentTarget, 'dragging');
619+
fileInput.value = '';
620+
621+
if (!e.dataTransfer || !e.dataTransfer.files || !e.dataTransfer.files.length) {
622+
return;
623+
}
624+
625+
var items = Array.prototype.slice.call(e.dataTransfer.items);
626+
if (items && items.length && items[0].webkitGetAsEntry) {
627+
for (var i = 0, len = items.length; i < len; i++) {
628+
var entry = items[i].webkitGetAsEntry();
629+
if (entry && entry.isDirectory) {
630+
return;
631+
}
632+
}
633+
}
634+
635+
if (optFile && optActive !== optFile) {
636+
optFile.focus();
637+
optFile.click();
638+
}
639+
640+
fileInput.files = e.dataTransfer.files;
641+
}
642+
643+
upload.addEventListener('dragenter', onDragEnterOver, false);
644+
upload.addEventListener('dragover', onDragEnterOver, false);
645+
upload.addEventListener('dragleave', onDragLeave, false);
646+
upload.addEventListener('drop', onDrop, false);
647+
}
648+
649649
enableAddDir();
650-
enableAddDragDrop();
651650
enableUploadProgress();
651+
enableAddDragDrop();
652652
}
653653

654654
function enableNonRefreshDelete() {

src/tpl/asset/main.js.go

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -473,45 +473,6 @@ onClickOptFile(); // prevent clear input files
473473
}
474474
});
475475
}
476-
function enableAddDragDrop() {
477-
function onDragEnterOver(e) {
478-
e.stopPropagation();
479-
e.preventDefault();
480-
addClass(e.currentTarget, 'dragging');
481-
}
482-
function onDragLeave(e) {
483-
if (e.target === e.currentTarget) {
484-
removeClass(e.currentTarget, 'dragging');
485-
}
486-
}
487-
function onDrop(e) {
488-
e.stopPropagation();
489-
e.preventDefault();
490-
removeClass(e.currentTarget, 'dragging');
491-
fileInput.value = '';
492-
if (!e.dataTransfer || !e.dataTransfer.files || !e.dataTransfer.files.length) {
493-
return;
494-
}
495-
var items = Array.prototype.slice.call(e.dataTransfer.items);
496-
if (items && items.length && items[0].webkitGetAsEntry) {
497-
for (var i = 0, len = items.length; i < len; i++) {
498-
var entry = items[i].webkitGetAsEntry();
499-
if (entry && entry.isDirectory) {
500-
return;
501-
}
502-
}
503-
}
504-
if (optFile && optActive !== optFile) {
505-
optFile.focus();
506-
optFile.click();
507-
}
508-
fileInput.files = e.dataTransfer.files;
509-
}
510-
upload.addEventListener('dragenter', onDragEnterOver, false);
511-
upload.addEventListener('dragover', onDragEnterOver, false);
512-
upload.addEventListener('dragleave', onDragLeave, false);
513-
upload.addEventListener('drop', onDrop, false);
514-
}
515476
function enableUploadProgress() { // also fix Safari upload filename has no path info
516477
if (!FormData) {
517478
return;
@@ -568,9 +529,48 @@ e.preventDefault();
568529
uploadProgressively();
569530
});
570531
}
532+
function enableAddDragDrop() {
533+
function onDragEnterOver(e) {
534+
e.stopPropagation();
535+
e.preventDefault();
536+
addClass(e.currentTarget, 'dragging');
537+
}
538+
function onDragLeave(e) {
539+
if (e.target === e.currentTarget) {
540+
removeClass(e.currentTarget, 'dragging');
541+
}
542+
}
543+
function onDrop(e) {
544+
e.stopPropagation();
545+
e.preventDefault();
546+
removeClass(e.currentTarget, 'dragging');
547+
fileInput.value = '';
548+
if (!e.dataTransfer || !e.dataTransfer.files || !e.dataTransfer.files.length) {
549+
return;
550+
}
551+
var items = Array.prototype.slice.call(e.dataTransfer.items);
552+
if (items && items.length && items[0].webkitGetAsEntry) {
553+
for (var i = 0, len = items.length; i < len; i++) {
554+
var entry = items[i].webkitGetAsEntry();
555+
if (entry && entry.isDirectory) {
556+
return;
557+
}
558+
}
559+
}
560+
if (optFile && optActive !== optFile) {
561+
optFile.focus();
562+
optFile.click();
563+
}
564+
fileInput.files = e.dataTransfer.files;
565+
}
566+
upload.addEventListener('dragenter', onDragEnterOver, false);
567+
upload.addEventListener('dragover', onDragEnterOver, false);
568+
upload.addEventListener('dragleave', onDragLeave, false);
569+
upload.addEventListener('drop', onDrop, false);
570+
}
571571
enableAddDir();
572-
enableAddDragDrop();
573572
enableUploadProgress();
573+
enableAddDragDrop();
574574
}
575575
function enableNonRefreshDelete() {
576576
if (!document.querySelector) {

0 commit comments

Comments
 (0)