Merge remote-tracking branch 'upstream/remaster' into remaster

This commit is contained in:
Hans5958 2022-04-29 11:49:52 +07:00
commit 89129347e2
2 changed files with 14 additions and 11 deletions

View file

@ -198,27 +198,32 @@ function initDraw() {
} }
}); });
finishButton.addEventListener("click", function (e) { finishButton.addEventListener("click", function() {
finish(); finish();
}); });
undoButton.addEventListener("click", function (e) { undoButton.addEventListener("click", function() {
undo(); undo();
}); });
redoButton.addEventListener("click", function (e) { redoButton.addEventListener("click", function() {
redo(); redo();
}); });
resetButton.addEventListener("click", function (e) { resetButton.addEventListener("click", function() {
reset(); reset();
}); });
cancelButton.addEventListener("click", function (e) { resetButton.addEventListener("blur", function() {
resetButton.textContent = "Reset";
resetButton.className = "btn btn-secondary";
});
cancelButton.addEventListener("click", function() {
back(); back();
}); });
previewButton.addEventListener("click", function (e) { previewButton.addEventListener("click", function() {
preview(); preview();
}); });
@ -391,8 +396,6 @@ function initDraw() {
updatePath() updatePath()
objectInfoBody.style.display = "none"; objectInfoBody.style.display = "none";
drawControlsBody.removeAttribute("style"); drawControlsBody.removeAttribute("style");
resetButton.textContent = "Reset";
resetButton.className = "btn btn-secondary";
} }
function renderBackground() { function renderBackground() {

View file

@ -292,8 +292,8 @@ <h5>Draw</h5>
</div> </div>
<div id="periods" class="p-2 pt-3 mb-3 bg-secondary bg-opacity-10 rounded"> <div id="periods" class="p-2 pt-3 mb-3 bg-secondary bg-opacity-10 rounded">
<h5 class="px-2">Timeline</h5> <h5 class="px-2">Timeline</h5>
<p id="periodsStatus" class="px-2"></p> <p id="periodsStatus" class="px-2 mb-2"></p>
<div id="periodGroups"></div> <div id="periodGroups" class="pt-1"></div>
<button type="button" class="btn btn-primary d-block mx-auto" id="periodsAdd">Add Period</button> <button type="button" class="btn btn-primary d-block mx-auto" id="periodsAdd">Add Period</button>
</div> </div>
<div id="hint"> <div id="hint">
@ -404,7 +404,7 @@ <h5 class="modal-title" id="donateModalLabel">Donation Links</h5>
<template id="period-group"> <template id="period-group">
<div class="period-group card mb-2"> <div class="period-group card mb-2">
<div class="card-body"> <div class="card-body">
<div class="alert alert-danger period-status small" role="alert"></div> <div class="period-status alert alert-danger small py-2" role="alert"></div>
<label for="period-start" class="form-label">Start Period</label> <label for="period-start" class="form-label">Start Period</label>
<input type="range" class="period-start form-range" id="period-start" min="0"> <input type="range" class="period-start form-range" id="period-start" min="0">
<label for="period-end" class="form-label">End Period</label> <label for="period-end" class="form-label">End Period</label>