From 5e01ad4c1721b7642f3b7954cefd72cb6923641c Mon Sep 17 00:00:00 2001
From: Terry Geng <terry@terriex.com>
Date: Sun, 21 Jun 2020 22:20:47 +0800
Subject: [PATCH] fixed: volume slider and upload modal bugs.

---
 web/src/js/main.mjs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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