Assclaw/jfa-go
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix scrolling on modals spawned by settings modal, fix getUsers cache

Browse Source 
closing the settings modal to immediately open another caused the
'modal-open' class on the body to get deleted, which meant scrolling
stopped working inside them. Also fix mistake added to jfapi in last commit.
This commit is contained in:
Harvey Tindall
2020-09-16 17:36:14 +01:00
parent 410c35c844
commit 802f957d22
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/templates/admin.html
+24 -3
View File
@@ -136,6 +136,10 @@
.settingIcon {
margin-left: 0.2rem;
}
body.modal-open {
overflow: hidden;
}
</style>
<title>Admin</title>
</head>
@@ -404,10 +408,23 @@
<script>
{{ if .bs5 }}
function createModal(id, find = false) {
let modal;
if (find) {
return bootstrap.Modal.getInstance(document.getElementById(id));
modal = bootstrap.Modal.getInstance(document.getElementById(id));
} else {
modal = new bootstrap.Modal(document.getElementById(id));
}
return new bootstrap.Modal(document.getElementById(id));
document.getElementById(id).addEventListener('shown.bs.modal', function () {
document.body.classList.add("modal-open");
});
return {
modal: modal,
show: function() {
let temp = this.modal.show();
return temp
},
hide: function() { return this.modal.hide(); }
};
}
{{ else }}
let send_to_addess_enabled = document.getElementById('send_to_address_enabled');
@@ -419,9 +436,13 @@
multiUseEnabled.classList.remove('form-check-input');
}
function createModal(id, find = false) {
$('#' + id).on('shown.bs.modal', function () {
document.body.classList.add("modal-open");
});
return {
show: function() {
return $('#' + id).modal('show');
let temp = $('#' + id).modal('show');
return temp
},
hide: function() {
return $('#' + id).modal('hide');