Skip to content

Commit 497c98e

Browse files
author
ozelot379
committed
Supports drag'n'drop
1 parent 07bce4f commit 497c98e

6 files changed

Lines changed: 176 additions & 185 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## [1.11.0]
44
- Supports mob effects
55
- Check if `pack.mcmeta` exists
6+
- Supports drag'n'drop
67

78
## [1.10.1]
89
- Exclude webapp from npm package

‎src/webapp/css/style.less‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,29 @@
11
@import (less) "~materialize-css/dist/css/materialize.min.css";
22

3-
.section {
4-
padding: 100px 0; // Center buttons
3+
html, body {
4+
display: flex;
5+
flex-direction: column;
6+
height: 100%;
7+
}
8+
9+
main {
10+
.black-text;
11+
align-items: center;
12+
border-color: currentColor;
13+
border-style: dashed;
14+
border-width: 5px;
15+
display: flex;
16+
flex-grow: 1;
17+
justify-content: center;
18+
min-height: 100px;
19+
20+
&.dragover {
21+
.brown-text;
22+
}
23+
}
24+
25+
input[type="file"] {
26+
display: none;
527
}
628

729
.swal-modal {

‎src/webapp/html/index.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
</div>
1414
</nav>
1515
</header>
16-
<main class="section center">
17-
<span>Select</span>
18-
<button class="btn green" id="selectInputFileButton" type="button">Zip file</button>
19-
<button class="btn green" id="selectInputFolderButton" type="button">Folder (*)</button>
20-
<span>* Not works on mobile browsers</span>
16+
<main>
17+
<span>Select&nbsp;</span>
18+
<label class="btn green"><input accept=".zip" id="selectInputFileButton" title="Select zip file" type="file">Zip file</label>
19+
<label>&nbsp;</label>
20+
<label class="btn green disabled"><input id="selectInputFolderButton" title="Select folder" type="file" webkitdirectory>Folder</label>
21+
<span>&nbsp;or drag'n'drop</span>
2122
</main>
2223
<footer class="page-footer brown">
2324
<div class="footer-copyright">

‎src/webapp/js/index.js‎

Lines changed: 144 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,151 @@
11
import fileSaver from "file-saver";
2-
import {select} from "./selector";
32
import swal from "sweetalert";
43
import Worker from "./worker";
54
import "./../css/style.less";
65

76
document.addEventListener("DOMContentLoaded", () => {
8-
const logs = document.createElement("ul");
9-
logs.classList.add("log");
10-
11-
const selectInputFileButton = document.getElementById("selectInputFileButton");
12-
selectInputFileButton.addEventListener("click", selectInputFile);
13-
14-
const selectInputFolderButton = document.getElementById("selectInputFolderButton");
15-
selectInputFolderButton.addEventListener("click", selectInputFolder);
16-
17-
const worker = new Worker();
18-
worker.addEventListener("message", afterConvert);
19-
20-
/**
21-
* @returns {Promise<>}
22-
*/
23-
async function selectInputFile() {
24-
return startConvert(await select("Select zip file", [".zip"]));
25-
}
26-
27-
/**
28-
* @returns {Promise<>}
29-
*/
30-
async function selectInputFolder() {
31-
// TODO: Set filter too because directory support can't be detected because webkitdirectory is set in HTMLInputElement.prototype even on mobile browsers which not supports this! :(
32-
return startConvert(await select("Select folder", [".zip"], true));
33-
}
34-
35-
/**
36-
* @param {FileList} input
37-
*
38-
* @returns {Promise<>}
39-
*/
40-
async function startConvert(input) {
41-
if (input.length === 0) {
42-
return;
43-
}
44-
45-
logs.innerHTML = "";
46-
47-
swal({
48-
title: "Conversion",
49-
content: logs,
50-
buttons: {
51-
save: {
52-
text: "Save",
53-
className: "swal-button--loading"
54-
}
55-
},
56-
closeOnClickOutside: false,
57-
closeOnEsc: false
58-
});
59-
document.querySelector(".swal-button--loading").disabled = true;
60-
61-
_log("Start conversion");
62-
63-
worker.postMessage(input);
64-
}
65-
66-
/**
67-
* @param {Event} e
68-
*
69-
* @returns {Promise<>}
70-
*/
71-
async function afterConvert(e) {
72-
const {log, err, output} = e.data;
73-
74-
if (log) {
75-
_log(log);
76-
return;
77-
}
78-
79-
if (err) {
80-
swal({
81-
title: "Conversion was failed",
82-
content: logs,
83-
icon: "error"
84-
});
85-
86-
_log("Conversion failed");
87-
return;
88-
}
89-
90-
const savePopup = swal({
91-
title: "Conversion was successfully",
92-
content: logs,
93-
icon: "success",
94-
buttons: "Save"
95-
});
96-
97-
_log("Conversion finished");
98-
99-
if (await savePopup) {
100-
if (output instanceof File) {
101-
fileSaver(output);
102-
} else {
103-
// TODO: Bug iOS `File` is undefined in worker?
104-
fileSaver(output.data, output.name);
105-
}
106-
}
107-
}
108-
109-
/**
110-
* @param {string} log
111-
*/
112-
function _log(log) {
113-
const li = document.createElement("li");
114-
115-
li.innerText = log;
116-
117-
logs.appendChild(li);
118-
119-
logs.scrollTop = logs.scrollHeight; // Scroll to bottom
120-
}
7+
const selectInputFileButton = document.getElementById("selectInputFileButton");
8+
selectInputFileButton.addEventListener("change", startConvert);
9+
10+
const selectInputFolderButton = document.getElementById("selectInputFolderButton");
11+
if (supportsFolderSelect()) {
12+
selectInputFolderButton.parentElement.classList.remove("disabled");
13+
selectInputFolderButton.addEventListener("change", startConvert);
14+
}
15+
16+
const main = document.querySelector("main");
17+
main.addEventListener("dragenter", startConvertDrop);
18+
main.addEventListener("dragleave", startConvertDrop);
19+
main.addEventListener("dragover", startConvertDrop);
20+
main.addEventListener("drop", startConvertDrop);
21+
22+
const worker = new Worker();
23+
worker.addEventListener("message", afterConvert);
24+
25+
const logs = document.createElement("ul");
26+
logs.classList.add("log");
27+
28+
/**
29+
* @returns {boolean}
30+
*/
31+
function supportsFolderSelect() {
32+
return (
33+
"webkitdirectory" in HTMLInputElement.prototype &&
34+
"webkitRelativePath" in File.prototype &&
35+
!(
36+
navigator.userAgent.match(/Mobile/i) ||
37+
(navigator.userAgent.match(/Safari/i) && "standalone" in navigator) // iPadOS
38+
));
39+
}
40+
41+
/**
42+
* @returns {Promise<>}
43+
*/
44+
async function startConvert() {
45+
const input = this.files;
46+
47+
if (input.length === 0) {
48+
return;
49+
}
50+
51+
logs.innerHTML = "";
52+
53+
swal({
54+
title: "Conversion",
55+
content: logs,
56+
buttons: {
57+
save: {
58+
text: "Save",
59+
className: "swal-button--loading"
60+
}
61+
},
62+
closeOnClickOutside: false,
63+
closeOnEsc: false
64+
});
65+
document.querySelector(".swal-button--loading").disabled = true;
66+
67+
_log("Start conversion");
68+
69+
worker.postMessage(input);
70+
}
71+
72+
/**
73+
* @param {DragEvent} e
74+
*
75+
* @returns {Promise<>}
76+
*/
77+
async function startConvertDrop(e) {
78+
e.preventDefault();
79+
80+
this.classList.remove("dragover");
81+
82+
switch (e.type) {
83+
case "dragenter":
84+
case "dragover":
85+
this.classList.add("dragover");
86+
break;
87+
88+
case "drop":
89+
return startConvert.call(e.dataTransfer);
90+
91+
default:
92+
break;
93+
}
94+
}
95+
96+
/**
97+
* @param {MessageEvent} e
98+
*
99+
* @returns {Promise<>}
100+
*/
101+
async function afterConvert(e) {
102+
const {log, err, output} = e.data;
103+
104+
if (log) {
105+
_log(log);
106+
return;
107+
}
108+
109+
if (err) {
110+
swal({
111+
title: "Conversion was failed",
112+
content: logs,
113+
icon: "error"
114+
});
115+
116+
_log("Conversion failed");
117+
return;
118+
}
119+
120+
const savePopup = swal({
121+
title: "Conversion was successfully",
122+
content: logs,
123+
icon: "success",
124+
buttons: "Save"
125+
});
126+
127+
_log("Conversion finished");
128+
129+
if (await savePopup) {
130+
if (output instanceof File) {
131+
fileSaver(output);
132+
} else {
133+
// TODO: Bug iOS `File` is undefined in worker?
134+
fileSaver(output.data, output.name);
135+
}
136+
}
137+
}
138+
139+
/**
140+
* @param {string} log
141+
*/
142+
function _log(log) {
143+
const li = document.createElement("li");
144+
145+
li.innerText = log;
146+
147+
logs.appendChild(li);
148+
149+
logs.scrollTop = logs.scrollHeight; // Scroll to bottom
150+
}
121151
});

‎src/webapp/js/selector.js‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎src/webapp/js/worker.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ addEventListener("message", async (e) => {
3030
error(log) {
3131
this.log(`ERROR: ${log}`);
3232
}
33-
}
33+
}()
3434
).convert()
3535
};
3636
} catch (err) {

0 commit comments

Comments
 (0)