storm/bragi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed: volume slider and upload modal bugs.

Browse Source
This commit is contained in:
Terry Geng 2020-06-21 22:20:47 +08:00
parent e0f41177d8
commit 5e01ad4c17
No known key found for this signature in database
GPG Key ID: F982F8EA1DF720E7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/src/js/main.mjs
View File

@ -4,6 +4,7 @@ import Popper from 'popper.js/dist/esm/popper';
import { import {
Modal, Modal,
Toast, Toast,
Tooltip
} from 'bootstrap/js/src/index'; } from 'bootstrap/js/src/index';
import { import {
isOverflown, isOverflown,
@ -813,8 +814,8 @@ document.getElementById('addTagModalSubmit').addEventListener('click', () => {
// ------- Volume ------ // ------- Volume ------
// --------------------- // ---------------------
const volumePopoverBtn = document.querySelector('#volume-popover-btn'); const volumePopoverBtn = document.getElementById('volume-popover-btn');
const volumePopoverDiv = document.querySelector('#volume-popover'); const volumePopoverDiv = document.getElementById('volume-popover');
let volume_popover_instance = null; let volume_popover_instance = null;
let volume_popover_show = false; let volume_popover_show = false;
let volume_update_timer; let volume_update_timer;
@ -863,7 +864,7 @@ volumeSlider.addEventListener('change', (e) => {
volume_update_timer = window.setTimeout(() => { volume_update_timer = window.setTimeout(() => {
request('post', { request('post', {
action: 'volume_set_value', action: 'volume_set_value',
new_volume: volumePopoverDiv.value, new_volume: volumeSlider.value,
}); });
}, 500); // delay in milliseconds }, 500); // delay in milliseconds
}); });
@ -889,6 +890,7 @@ const uploadTargetDir = document.getElementById('uploadTargetDir');
const uploadSuccessAlert = document.getElementById('uploadSuccessAlert'); const uploadSuccessAlert = document.getElementById('uploadSuccessAlert');
const uploadSubmitBtn = document.getElementById('uploadSubmit'); const uploadSubmitBtn = document.getElementById('uploadSubmit');
const uploadCancelBtn = document.getElementById('uploadCancel'); const uploadCancelBtn = document.getElementById('uploadCancel');
const uploadCancelTooltip = new Tooltip(uploadCancelBtn);
const uploadCloseBtn = document.getElementById('uploadClose'); const uploadCloseBtn = document.getElementById('uploadClose');
const maxFileSize = parseInt(document.getElementById('maxUploadFileSize').value); const maxFileSize = parseInt(document.getElementById('maxUploadFileSize').value);
@ -908,7 +910,7 @@ function uploadStart() {
uploadCancelBtn.style.display = 'none'; uploadCancelBtn.style.display = 'none';
uploadCloseBtn.style.display = 'block'; uploadCloseBtn.style.display = 'block';
areYouSureToCancelUploading = false; areYouSureToCancelUploading = false;
$(uploadCancelBtn).tooltip('hide'); uploadCancelTooltip.hide();
const file_list = uploadFileInput.files; const file_list = uploadFileInput.files;
if (file_list.length) { if (file_list.length) {
@ -1024,9 +1026,9 @@ function uploadNextFile() {
function uploadCancel() { function uploadCancel() {
if (!areYouSureToCancelUploading) { if (!areYouSureToCancelUploading) {
$(uploadCancelBtn).tooltip('show'); uploadCancelTooltip.show();
} else { } else {
$(uploadCancelBtn).tooltip('hide'); uploadCancelTooltip.hide();
uploadModal.hide(); uploadModal.hide();
runningXHR.abort(); runningXHR.abort();
filesToProceed = []; filesToProceed = [];