diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 41d6b407e2..db8c3716c5 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -14,12 +14,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.473", - "_release": "1.4.473", + "version": "1.4.474", + "_release": "1.4.474", "_resolution": { "type": "version", - "tag": "1.4.473", - "commit": "5480407d7cc7201e3310cb892c5d2779507d7240" + "tag": "1.4.474", + "commit": "6e74a88452ec9dee906696b042c969dcc1aee842" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/chromecastplayer.js b/dashboard-ui/bower_components/emby-webcomponents/chromecastplayer.js index c7e76256d9..b2de9c336f 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/chromecastplayer.js +++ b/dashboard-ui/bower_components/emby-webcomponents/chromecastplayer.js @@ -971,6 +971,18 @@ }); }; + self.getCurrentPlaylistIndex = function () { + return 0; + }; + + self.setCurrentPlaylistIndex = function (index) { + return Promise.resolve(); + }; + + self.removeFromPlaylist = function (index) { + return Promise.resolve(); + }; + self.getPlayerState = function () { return Promise.resolve(self.getPlayerStateInternal() || {}); diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.css b/dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.css index c2d6254b03..c080aef980 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.css +++ b/dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.css @@ -16,7 +16,7 @@ _:-ms-input-placeholder, :root .mdl-slider { -ms-user-select: none; user-select: none; outline: 0; - padding: 1.5em 0; + padding: 1em 0; color: #52B54B; -webkit-align-self: center; -ms-flex-item-align: center; diff --git a/dashboard-ui/bower_components/emby-webcomponents/multiselect/multiselect.css b/dashboard-ui/bower_components/emby-webcomponents/multiselect/multiselect.css index 76ea15a00f..5be359bd44 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/multiselect/multiselect.css +++ b/dashboard-ui/bower_components/emby-webcomponents/multiselect/multiselect.css @@ -23,11 +23,10 @@ } .itemSelectionCount { - font-size: 28px; vertical-align: middle; color: #fff; - display: inline-block; - padding-top: 1px; + opacity: 1 !important; + margin: 0; } .multiSelectCheckboxOutline { diff --git a/dashboard-ui/bower_components/emby-webcomponents/multiselect/multiselect.js b/dashboard-ui/bower_components/emby-webcomponents/multiselect/multiselect.js index ba611ecf8e..afad52fbaa 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/multiselect/multiselect.js +++ b/dashboard-ui/bower_components/emby-webcomponents/multiselect/multiselect.js @@ -126,10 +126,8 @@ var html = ''; - html += '
'; html += ''; - html += ''; - html += '
'; + html += '

'; var moreIcon = appHost.moreIcon === 'dots-horiz' ? '' : ''; html += ''; diff --git a/dashboard-ui/bower_components/emby-webcomponents/sessionplayer.js b/dashboard-ui/bower_components/emby-webcomponents/sessionplayer.js index 11fc53bea0..be037961ee 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/sessionplayer.js +++ b/dashboard-ui/bower_components/emby-webcomponents/sessionplayer.js @@ -283,6 +283,18 @@ return state.MediaType === 'Audio'; }; + self.getCurrentPlaylistIndex = function () { + return 0; + }; + + self.setCurrentPlaylistIndex = function (index) { + return Promise.resolve(); + }; + + self.removeFromPlaylist = function (index) { + return Promise.resolve(); + }; + self.getPlayerState = function () { var apiClient = getCurrentApiClient(); diff --git a/dashboard-ui/components/remotecontrol.js b/dashboard-ui/components/remotecontrol.js index cb47d37507..34dd86d310 100644 --- a/dashboard-ui/components/remotecontrol.js +++ b/dashboard-ui/components/remotecontrol.js @@ -540,13 +540,15 @@ }); } - function onPlaybackStopped(e, state) { + function onPlaybackStopped(e, stopInfo) { console.log('remotecontrol event: ' + e.type); - var player = this; - updatePlayerState(dlg, {}); - loadPlaylist(dlg); + + if (!stopInfo.nextMediaType) { + updatePlayerState(dlg, {}); + loadPlaylist(dlg); + } } function onPlayPauseStateChanged(e) { diff --git a/dashboard-ui/css/nowplaying.css b/dashboard-ui/css/nowplaying.css index 3ab775717e..b881004ee8 100644 --- a/dashboard-ui/css/nowplaying.css +++ b/dashboard-ui/css/nowplaying.css @@ -17,7 +17,7 @@ } .nowPlayingPositionSliderContainer { - margin: .7em 1em .7em; + margin: .7em 0 .7em 1em; } .nowPlayingInfoButtons { @@ -101,8 +101,7 @@ .nowPlayingPageImage { width: auto; - max-width: 100%; - max-height: 36vh; + height: 40vh; } } @@ -120,7 +119,8 @@ @media all and (min-width: 800px) { .nowPlayingSecondaryButtons { - margin-left: auto; + flex-grow: 1; + justify-content: flex-end; } } @@ -157,3 +157,7 @@ .nowPlayingCastIcon { font-size: 86%; } + +.nowPlayingVolumeSliderContainer { + width: 6em; +} \ No newline at end of file