Skip to content
Extraits de code Groupes Projets
Vérifiée Valider d1a1b4e4 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

Filter with last request when reloading the db, delete the 'reload all' button...

Filter with last request when reloading the db, delete the 'reload all' button that was here for debug
parent b270cc29
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!10Settings in instance
......@@ -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';
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter