From 461ccdd669b2ab7f1533fe7ab93690d9af5adf51 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 9 Feb 2016 13:05:12 -0500 Subject: [PATCH] fixes #896 - Chromecast icon needs to be displayed while playing videos on the web --- .../dashboard-ui/components/remotecontrol.js | 7 +++++-- .../dashboard-ui/scripts/librarymenu.js | 20 ++++++++++--------- .../dashboard-ui/scripts/mediacontroller.js | 3 ++- .../dashboard-ui/scripts/mediaplayer-video.js | 1 + 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/MediaBrowser.WebDashboard/dashboard-ui/components/remotecontrol.js b/MediaBrowser.WebDashboard/dashboard-ui/components/remotecontrol.js index c4bdb1d877..2dc01a8f77 100644 --- a/MediaBrowser.WebDashboard/dashboard-ui/components/remotecontrol.js +++ b/MediaBrowser.WebDashboard/dashboard-ui/components/remotecontrol.js @@ -551,15 +551,18 @@ function updateCastIcon(context) { var info = MediaController.getPlayerInfo(); + var btnCast = context.querySelector('.nowPlayingCastIcon'); if (info.isLocalPlayer) { - context.querySelector('.nowPlayingCastIcon').icon = 'cast'; + btnCast.icon = 'cast'; + btnCast.classList.remove('btnActiveCast'); context.querySelector('.nowPlayingSelectedPlayer').innerHTML = ''; } else { - context.querySelector('.nowPlayingCastIcon').icon = 'cast-connected'; + btnCast.icon = 'cast-connected'; + btnCast.classList.add('btnActiveCast'); context.querySelector('.nowPlayingSelectedPlayer').innerHTML = info.deviceName || info.name; } } diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/librarymenu.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/librarymenu.js index 5fef25d819..4cacfc8174 100644 --- a/MediaBrowser.WebDashboard/dashboard-ui/scripts/librarymenu.js +++ b/MediaBrowser.WebDashboard/dashboard-ui/scripts/librarymenu.js @@ -674,22 +674,24 @@ function updateCastIcon() { + var context = document; + + var btnCast = context.querySelector('.btnCast'); + var info = MediaController.getPlayerInfo(); if (info.isLocalPlayer) { - $('.btnCast').removeClass('btnActiveCast').each(function () { - this.icon = 'cast'; - }); - $('.headerSelectedPlayer').html(''); + btnCast.icon = 'cast'; + btnCast.classList.remove('btnActiveCast'); - } else { + context.querySelector('.headerSelectedPlayer').innerHTML = ''; - $('.btnCast').addClass('btnActiveCast').each(function () { - this.icon = 'cast-connected'; - }); + } else { - $('.headerSelectedPlayer').html((info.deviceName || info.name)); + btnCast.icon = 'cast-connected'; + btnCast.classList.add('btnActiveCast'); + context.querySelector('.headerSelectedPlayer').innerHTML = info.deviceName || info.name; } } diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/mediacontroller.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/mediacontroller.js index f12d36e3fb..8846db6faf 100644 --- a/MediaBrowser.WebDashboard/dashboard-ui/scripts/mediacontroller.js +++ b/MediaBrowser.WebDashboard/dashboard-ui/scripts/mediacontroller.js @@ -64,7 +64,7 @@ }); } - function showPlayerSelection(button) { + function showPlayerSelection(button, enableHistory) { var playerInfo = MediaController.getPlayerInfo(); @@ -101,6 +101,7 @@ title: Globalize.translate('HeaderSelectPlayer'), items: menuItems, positionTo: button, + enableHistory: enableHistory !== false, callback: function (id) { var target = targets.filter(function (t) { diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/mediaplayer-video.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/mediaplayer-video.js index 690ebfbeab..30ff85db82 100644 --- a/MediaBrowser.WebDashboard/dashboard-ui/scripts/mediaplayer-video.js +++ b/MediaBrowser.WebDashboard/dashboard-ui/scripts/mediaplayer-video.js @@ -743,6 +743,7 @@ html += ''; + html += ''; html += ''; html += ''; //html += '';