diff --git a/dashboard-ui/scripts/autoorganizelog.js b/dashboard-ui/scripts/autoorganizelog.js index 044dd9f54d..7b20fc3100 100644 --- a/dashboard-ui/scripts/autoorganizelog.js +++ b/dashboard-ui/scripts/autoorganizelog.js @@ -311,6 +311,21 @@ } } + function onWebSocketMessage(e, msg) { + + var page = $.mobile.activePage; + + if (msg.MessageType == "ScheduledTaskEnded") { + + var result = msg.Data; + + if (result.Key == 'AutoOrganize') { + + reloadItems(page); + } + } + } + $(document).on('pageinit', "#libraryFileOrganizerLogPage", function () { var page = this; @@ -337,6 +352,8 @@ taskKey: 'AutoOrganize' }); + $(ApiClient).on("websocketmessage.autoorganizelog", onWebSocketMessage); + }).on('pagehide', "#libraryFileOrganizerLogPage", function () { var page = this; @@ -347,6 +364,8 @@ $('.btnOrganize', page).taskButton({ mode: 'off' }); + + $(ApiClient).off(".autoorganizelog"); }); window.OrganizerLogPage = { diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js index 9476e545ea..9bd3cb6a5a 100644 --- a/dashboard-ui/scripts/search.js +++ b/dashboard-ui/scripts/search.js @@ -459,6 +459,11 @@ }); $('.btnCloseSearch').on('click', closeSearchOverlay); + + $('.viewMenuSearchForm').on('submit', function () { + + return false; + }); } function closeSearchOverlay() {