diff --git a/dashboard-ui/css/posteritem.css b/dashboard-ui/css/posteritem.css index 9c1b8ce5fe..cb51b98081 100644 --- a/dashboard-ui/css/posteritem.css +++ b/dashboard-ui/css/posteritem.css @@ -32,7 +32,7 @@ } .posterItemOverlayInner { - padding: 13px 13px 10px; + padding: 11px 12px 10px; } .smallBackdropPosterItem, .smallPosterItem { diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index f510a30a9a..7fa5f5610f 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1170,7 +1170,7 @@ if (item.Type == "Channel") { return ''; } - if (item.Type == "Series" || item.Type == "Season" || item.Type == "BoxSet" || item.MediaType == "Video") { + if (item.Type == "Series" || item.Type == "Season" || item.Type == "BoxSet" || item.MediaType == "Video" || item.MediaType == "Game" || item.MediaType == "Book") { if (item.RecursiveUnplayedItemCount) { return '
' + item.RecursiveUnplayedItemCount + '
'; } diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index f9619353f8..39aed1c255 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -21,8 +21,6 @@ var timeout; var idleState = true; - var msieWebmMessage = "For more reliable video playback with Internet Explorer desktop edition, please install google's webm plugin for IE.

https://tools.google.com/dlpage/webmmf"; - self.playlist = []; var currentPlaylistIndex = 0; @@ -713,7 +711,6 @@ SubtitleStreamIndex: getInitialSubtitleStreamIndex(mediaStreams, user), AudioStreamIndex: getInitialAudioStreamIndex(mediaStreams, user), deviceId: ApiClient.deviceId(), - Type: item.Type, Static: false }; @@ -903,10 +900,6 @@ if (item.Type == "Channel") { errorMsg += " Please ensure there is an open tuner availalble."; } - - if ($.browser.msie && !canPlayWebm()) { - errorMsg += " " + msieWebmMessage; - } Dashboard.alert({ title: 'Video Error', @@ -1090,12 +1083,6 @@ return; } } - else if ($.browser.msie && videoType && !canPlayWebm()) { - - self.playWithWarning(items, startPosition, user, "iewebmplugin", "Internet Explorer Playback", msieWebmMessage); - return; - - } self.playInternal(items[0], startPosition, user); self.onPlaybackStarted(items); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index bdbc305ac9..4687bc09e8 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -801,7 +801,7 @@ var Dashboard = { var webSocketUrl = "ws://" + location.hostname; - if (systemInfo.HttpServerPortNumber != systemInfo.WebSocketPortNumber) { + if (systemInfo.HttpServerPortNumber == systemInfo.WebSocketPortNumber) { if (location.port) { webSocketUrl += ':' + location.port;