mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #2089 from softworkz/OrganizeFixes3

Browse source 
AutoorganizeLog: Fixed error when log empty; re-introduced full reload on task completion
This commit is contained in:
Luke 2016-08-27 17:10:35 -04:00 • committed by GitHub
commit 3fac9fa99d
1 changed files with 40 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

59
dashboard-ui/dashboard/autoorganizelog.js
View file

@ -205,25 +205,33 @@
var btnPrevTop = topPaging.querySelector(".btnPreviousPage"); var btnPrevTop = topPaging.querySelector(".btnPreviousPage");
var btnPrevBottom = bottomPaging.querySelector(".btnPreviousPage"); var btnPrevBottom = bottomPaging.querySelector(".btnPreviousPage");
btnNextTop.addEventListener('click', function () { if (btnNextTop) {
query.StartIndex += query.Limit; btnNextTop.addEventListener('click', function () {
reloadItems(page, true); query.StartIndex += query.Limit;
}); reloadItems(page, true);
});
}
btnNextBottom.addEventListener('click', function () { if (btnNextBottom) {
query.StartIndex += query.Limit; btnNextBottom.addEventListener('click', function () {
reloadItems(page, true); query.StartIndex += query.Limit;
}); reloadItems(page, true);
});
}
btnPrevTop.addEventListener('click', function () { if (btnPrevTop) {
query.StartIndex -= query.Limit; btnPrevTop.addEventListener('click', function () {
reloadItems(page, true); query.StartIndex -= query.Limit;
}); reloadItems(page, true);
});
}
btnPrevBottom.addEventListener('click', function () { if (btnPrevBottom) {
query.StartIndex -= query.Limit; btnPrevBottom.addEventListener('click', function () {
reloadItems(page, true); query.StartIndex -= query.Limit;
}); reloadItems(page, true);
});
}
var btnClearLog = page.querySelector('.btnClearLog'); var btnClearLog = page.querySelector('.btnClearLog');
@ -317,7 +325,12 @@
function onServerEvent(e, apiClient, data) { function onServerEvent(e, apiClient, data) {
if (data) { if (e.type == 'ScheduledTaskEnded') {
if (data && data.Key == 'AutoOrganize') {
reloadItems(page, false);
}
} else if (e.type == 'AutoOrganize_ItemUpdated' && data) {
updateItemStatus(page, data); updateItemStatus(page, data);
} else { } else {
@ -372,7 +385,11 @@
reloadItems(view, true); reloadItems(view, true);
events.on(serverNotifications, 'AutoOrganizeUpdate', onServerEvent); events.on(serverNotifications, 'AutoOrganize_LogReset', onServerEvent);
events.on(serverNotifications, 'AutoOrganize_ItemUpdated', onServerEvent);
events.on(serverNotifications, 'AutoOrganize_ItemRemoved', onServerEvent);
events.on(serverNotifications, 'AutoOrganize_ItemAdded', onServerEvent);
events.on(serverNotifications, 'ScheduledTaskEnded', onServerEvent);
// on here // on here
taskButton({ taskButton({
@ -388,7 +405,11 @@
currentResult = null; currentResult = null;
events.off(serverNotifications, 'AutoOrganizeUpdate', onServerEvent); events.off(serverNotifications, 'AutoOrganize_LogReset', onServerEvent);
events.off(serverNotifications, 'AutoOrganize_ItemUpdated', onServerEvent);
events.off(serverNotifications, 'AutoOrganize_ItemRemoved', onServerEvent);
events.off(serverNotifications, 'AutoOrganize_ItemAdded', onServerEvent);
events.off(serverNotifications, 'ScheduledTaskEnded', onServerEvent);
// off here // off here
taskButton({ taskButton({