NussNougate/crafty-4
2
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-01-18 17:15:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/bedrock_root_files' into 'dev'

Browse Source 
Fix logic in bedrock server import frontend

See merge request crafty-controller/crafty-4!797
This commit is contained in:
Iain Powrie 2024-10-02 21:06:24 +00:00
commit c59c5f960f
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -3,7 +3,7 @@
### New features ### New features
TBD TBD
### Bug fixes ### Bug fixes
TBD - Fix logic issue causing bedrock wizard's root files buttons to not respond to user click events ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/797))
### Tweaks ### Tweaks
TBD TBD
### Lang ### Lang

11
app/frontend/templates/server/bedrock_wizard.html
View File

@ -498,24 +498,19 @@
<script src="../../static/assets/js/shared/upload.js"></script> <script src="../../static/assets/js/shared/upload.js"></script>
<script> <script>
document.getElementById("root_upload_button").addEventListener("click", function (event) { document.getElementById("root_upload_button").addEventListener("click", function (event) {
if (file) {
upload = true;
if (document.getElementById('root_upload_button').classList.contains('clicked')) { if (document.getElementById('root_upload_button').classList.contains('clicked')) {
document.getElementById('main-tree-div-upload').innerHTML = '<input type="radio" class="root-input" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree-upload" class="files-tree-title tree-caret-down root-dir"><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>' show_file_tree();
return;
} else { } else {
document.getElementById('root_upload_button').classList.add('clicked') document.getElementById('root_upload_button').classList.add('clicked')
} }
const token = getCookie("_xsrf"); bootbox.dialog({
var dialog = bootbox.dialog({
message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>', message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
closeButton: false closeButton: false
}); });
setTimeout(function () { setTimeout(function () {
getDirView(); getDirView();
}, 2000); }, 2000);
} else {
bootbox.alert("You must input a path before selecting this button");
}
}); });
function eula_confirm() { function eula_confirm() {