diff --git a/dashboard-ui/bower_components/emby-apiclient/.bower.json b/dashboard-ui/bower_components/emby-apiclient/.bower.json index 600f3be3e7..2135a02cc8 100644 --- a/dashboard-ui/bower_components/emby-apiclient/.bower.json +++ b/dashboard-ui/bower_components/emby-apiclient/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.1.60", - "_release": "1.1.60", + "version": "1.1.61", + "_release": "1.1.61", "_resolution": { "type": "version", - "tag": "1.1.60", - "commit": "302c2d3c2f59c366ee9d198f205b8350317cda41" + "tag": "1.1.61", + "commit": "6a78282741579ae715a93d4da77393d887ecc52e" }, "_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_target": "^1.1.51", diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 037de20b7b..58198bcf72 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -15,12 +15,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.3.95", - "_release": "1.3.95", + "version": "1.3.96", + "_release": "1.3.96", "_resolution": { "type": "version", - "tag": "1.3.95", - "commit": "7ce02ce7ef6b3792a1a381c62682fd217edf188b" + "tag": "1.3.96", + "commit": "d3c620a7ba6ca5e56c528d687bc6b5306095fbd5" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.0", diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css index eb9d3121b2..f5e4fd8854 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css +++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css @@ -201,7 +201,7 @@ } } -@media all and (max-width: 1280px) { +@media all and (max-width: 1200px) { .channelHeaderCell.withImage .guideChannelNumber { display: none; diff --git a/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js b/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js index 3d020110f9..ffaf0a4a12 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js +++ b/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js @@ -121,13 +121,16 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g var apiClient = connectionManager.getApiClient(serverId); - if (seriesTimerId) { - // cancel all + if (seriesTimerId && timerId) { + + // cancel + cancelTimer(apiClient, timerId, true); } else if (timerId) { // change to series recording, if possible // otherwise cancel individual recording + changeRecordingToSeries(apiClient, timerId, id); } else if (type == 'Program') { // schedule recording @@ -135,6 +138,42 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g } } + function changeRecordingToSeries(apiClient, timerId, programId) { + + loading.show(); + + apiClient.getItem(apiClient.getCurrentUserId(), programId).then(function (item) { + + if (item.IsSeries) { + // cancel, then create series + cancelTimer(apiClient, timerId, false).then(function () { + apiClient.getNewLiveTvTimerDefaults({ programId: programId }).then(function (timerDefaults) { + + apiClient.createLiveTvSeriesTimer(timerDefaults).then(function () { + + loading.hide(); + sendToast(globalize.translate('sharedcomponents#SeriesRecordingScheduled')); + }); + }); + }); + } else { + // cancel + cancelTimer(apiClient, timerId, true); + } + }); + } + + function cancelTimer(apiClient, timerId, hideLoading) { + loading.show(); + return apiClient.cancelLiveTvTimer(timerId).then(function () { + + if (hideLoading) { + loading.hide(); + sendToast(globalize.translate('sharedcomponents#RecordingCancelled')); + } + }); + } + function createRecording(apiClient, programId) { loading.show(); diff --git a/dashboard-ui/bower_components/emby-webcomponents/slideshow/slideshow.js b/dashboard-ui/bower_components/emby-webcomponents/slideshow/slideshow.js index 3255f4a0ac..b7278712f8 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/slideshow/slideshow.js +++ b/dashboard-ui/bower_components/emby-webcomponents/slideshow/slideshow.js @@ -119,7 +119,8 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f exitAnimationDuration: options.interactive ? 400 : 800, size: 'fullscreen', autoFocus: false, - scrollY: false + scrollY: false, + exitAnimation: 'fadeout' }); dlg.classList.add('slideshowDialog'); @@ -233,7 +234,8 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f lazyLoading: true, lazyLoadingInPrevNext: true, autoplayDisableOnInteraction: false, - initialSlide: options.startIndex || 0 + initialSlide: options.startIndex || 0, + speed: 240 }); swiperInstance.on('onLazyImageLoad', onSlideChangeStart); diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json index df48e73a80..58bdb1243d 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json @@ -23,7 +23,9 @@ "ButtonOk": "Ok", "ButtonCancel": "Cancel", "ButtonGotIt": "Got It", + "RecordingCancelled": "Recording cancelled.", "RecordingScheduled": "Recording scheduled.", + "SeriesRecordingScheduled": "Series recording scheduled.", "HeaderNewRecording": "New Recording", "Sunday": "Sunday", "Monday": "Monday", diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json index 955c9dc566..01c5a1084b 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -36,7 +36,7 @@ "tag": "v1.5.2", "commit": "18e8e12dcd9a4560de480562f65935feed334b86" }, - "_source": "git://github.com/PolymerElements/iron-selector.git", + "_source": "git://github.com/polymerelements/iron-selector.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-selector" + "_originalSource": "polymerelements/iron-selector" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json index bbad7fe7ba..3e8a4009a3 100644 --- a/dashboard-ui/bower_components/polymer/.bower.json +++ b/dashboard-ui/bower_components/polymer/.bower.json @@ -34,6 +34,6 @@ "commit": "11c987b2eb3c73b388a79fc8aaea8ca01624f514" }, "_source": "git://github.com/Polymer/polymer.git", - "_target": "^1.1.0", + "_target": "^1.0.0", "_originalSource": "Polymer/polymer" } \ No newline at end of file