From d1a1b4e48a8d2d37819e538ed1015fdbc51f8a23 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Thu, 11 Feb 2021 14:05:18 +0100
Subject: [PATCH] Filter with last request when reloading the db, delete the
'reload all' button that was here for debug
---
instance/main.js | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/instance/main.js b/instance/main.js
index 9212ba6..73dcb2c 100644
--- a/instance/main.js
+++ b/instance/main.js
@@ -5,7 +5,6 @@ const e = require('express');
/* prettier-ignore */
const buttonList = [
- [ 'left', `<i class="fas fa-sync-alt"></i>`, 'reloadDb', 'Reload database' ],
[ 'left', `<i class="fas fa-play"></i>`, 'commandPlay', 'Play or pause Lektor' ],
[ 'left', `<i class="fas fa-stop"></i>`, 'commandStop', 'Stop lektor' ],
[ 'left', `<i class="fas fa-eraser"></i>`, 'commandClear', 'Clear the queue' ],
@@ -19,9 +18,16 @@ const buttonList = [
[ 'right', `<i class="fas fa-user-friends"></i>`, 'openUserView', 'Open client view' ],
[ 'right', `<i class="fas fa-music"></i>`, 'openMdtView', 'Open metadata view' ],
[ 'right', `<i class="fas fa-sync-alt"></i>`, 'reloadQueue', 'Reload the queue' ],
- [ 'right', `<i class="fas fa-window-close"></i>`, 'closeButton', 'Quit Lektor-App' ],
+ [ 'right', `<i class="fas fa-window-close"></i>`, 'closeButton', 'Quit Amadeus' ],
];
+/* Global variables */
+var countKaraInQueue = 0;
+var currentSong = 0;
+var dragCounter = 0;
+var leavedElement;
+var isDnDFromDB = false;
+
function addIpcToButton(btnId, ipc) {
document.getElementById(btnId).addEventListener('click', () => {
ipc.forEach(ipc => {
@@ -40,7 +46,7 @@ window.onload = () => {
addIpcToButton('commandClear', ['cmd-clear']);
addIpcToButton('selectAdvence', ['select-advence']);
- addIpcToButton('selectDatabase', ['select-database']);
+ addIpcToButton('selectDatabase', ['select-database', 'reload-db-request']);
addIpcToButton('selectPlaylist', ['select-playlist']);
addIpcToButton('selectPool', ['select-pool']);
addIpcToButton('openMdtView', ['select-mdt']);
@@ -48,7 +54,6 @@ window.onload = () => {
addIpcToButton('openKurisu', ['toggle-kurisu']);
addIpcToButton('openUserView', ['toggle-client-view']);
addIpcToButton('reloadQueue', ['reload-queue-request']);
- addIpcToButton('reloadDb', ['reload-db-request', 'reload-queue-request']);
setTimeout(() => ipcRenderer.send('reload-queue-request'), 1000);
setInterval(() => ipcRenderer.send('verify-queue-reloaded-request'), 50);
@@ -58,7 +63,9 @@ window.onload = () => {
$('#filterInput').on('keypress', e => {
/* On 'Return'. */
if (e.which != 13) return;
- ipcRenderer.send('reload-db-request', $('#filterInput').val());
+ ipcRenderer.send('reload-db-request', {
+ search: $('#filterInput').val(),
+ });
});
document.addEventListener(
@@ -150,7 +157,6 @@ ipcRenderer.on('reload-db-responce', (event, arg) => {
);
});
-var countKaraInQueue = 0;
/* Create the right panel: the queue */
ipcRenderer.on('reload-queue-responce', (event, arg) => {
logger.debug('instance', `Web page got reload-queue`);
@@ -175,7 +181,6 @@ ipcRenderer.on('reload-queue-responce', (event, arg) => {
);
});
-var currentSong = 0;
ipcRenderer.on('send-song-time-data', (event, timeData) => {
document.getElementById('progressBar').style.width = `${
(timeData.elapsed / timeData.total) *
@@ -242,10 +247,6 @@ function addQueueKaraEventHandlers(element) {
);
}
-var dragCounter = 0;
-var leavedElement;
-var isDnDFromDB = false;
-
function onDragStartDB(event) {
isDnDFromDB = true;
event.dataTransfer.effectAllowed = 'move';
--
GitLab