diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js index 99ac54982b..8dc2cffe58 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js +++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js @@ -148,6 +148,8 @@ channelQuery.Limit = channelLimit; channelQuery.AddCurrentProgram = false; + channelQuery.EnableUserData = false; + channelQuery.EnableImageTypes = "Primary"; channelsPromise = channelsPromise || apiClient.getLiveTvChannels(channelQuery); @@ -169,9 +171,10 @@ return c.Id; }).join(','), ImageTypeLimit: 1, - EnableImageTypes: "Primary,Backdrop", + EnableImageTypes: layoutManager.tv ? "Primary,Backdrop" : "Primary", SortBy: "StartDate", - EnableTotalRecordCount: false + EnableTotalRecordCount: false, + EnableUserData: false }).then(function (programsResult) { diff --git a/dashboard-ui/components/syncjoblist/syncjoblist.js b/dashboard-ui/components/syncjoblist/syncjoblist.js index 5acaa0c44d..3a2ae08d8b 100644 --- a/dashboard-ui/components/syncjoblist/syncjoblist.js +++ b/dashboard-ui/components/syncjoblist/syncjoblist.js @@ -198,6 +198,8 @@ globalize.translate('CancelSyncJobConfirmation'); if (listInstance.options.isLocalSync) { options.TargetId = apiClient.deviceId(); + } else { + options.ExcludeTargetIds = apiClient.deviceId(); } return apiClient.getJSON(ApiClient.getUrl('Sync/Jobs', options)).then(function (response) { @@ -303,7 +305,7 @@ globalize.translate('CancelSyncJobConfirmation'); this.options = options; var onSyncJobsUpdatedHandler = onSyncJobsUpdated.bind(this); - this.onSyncJobsUpdatedHandler = null; + this.onSyncJobsUpdatedHandler = onSyncJobsUpdatedHandler; events.on(serverNotifications, 'SyncJobs', onSyncJobsUpdatedHandler); var onClickHandler = onElementClick.bind(this); @@ -318,15 +320,15 @@ globalize.translate('CancelSyncJobConfirmation'); stopListening(this); - this.options = null; - var onSyncJobsUpdatedHandler = this.onSyncJobsUpdatedHandler; this.onSyncJobsUpdatedHandler = null; events.off(serverNotifications, 'SyncJobs', onSyncJobsUpdatedHandler); var onClickHandler = this.onClickHandler; this.onClickHandler = null; - options.element.removeEventListener('click', onClickHandler); + this.options.element.removeEventListener('click', onClickHandler); + + this.options = null; }; return syncJobList; diff --git a/dashboard-ui/mysync.html b/dashboard-ui/mysync.html index bde3b84ea1..16cd88f635 100644 --- a/dashboard-ui/mysync.html +++ b/dashboard-ui/mysync.html @@ -2,9 +2,14 @@