mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

remove webm messages

Browse source
This commit is contained in:
Luke Pulverenti 2014-01-22 17:38:55 -05:00
parent 0cadf2308a
commit e02f9c8726
4 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/css/posteritem.css
View file

@ -32,7 +32,7 @@
} }
.posterItemOverlayInner { .posterItemOverlayInner {
padding: 13px 13px 10px; padding: 11px 12px 10px;
} }
.smallBackdropPosterItem, .smallPosterItem { .smallBackdropPosterItem, .smallPosterItem {

2
dashboard-ui/scripts/librarybrowser.js
View file

@ -1170,7 +1170,7 @@
if (item.Type == "Channel") { if (item.Type == "Channel") {
return ''; 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) { if (item.RecursiveUnplayedItemCount) {
return '<div class="unplayedIndicator">' + item.RecursiveUnplayedItemCount + '</div>'; return '<div class="unplayedIndicator">' + item.RecursiveUnplayedItemCount + '</div>';
} }

13
dashboard-ui/scripts/mediaplayer.js
View file

@ -21,8 +21,6 @@
var timeout; var timeout;
var idleState = true; var idleState = true;
var msieWebmMessage = "For more reliable video playback with Internet Explorer desktop edition, please install google's webm plugin for IE.<br/><br/><a target='_blank' href='https://tools.google.com/dlpage/webmmf'>https://tools.google.com/dlpage/webmmf</a>";
self.playlist = []; self.playlist = [];
var currentPlaylistIndex = 0; var currentPlaylistIndex = 0;
@ -713,7 +711,6 @@
SubtitleStreamIndex: getInitialSubtitleStreamIndex(mediaStreams, user), SubtitleStreamIndex: getInitialSubtitleStreamIndex(mediaStreams, user),
AudioStreamIndex: getInitialAudioStreamIndex(mediaStreams, user), AudioStreamIndex: getInitialAudioStreamIndex(mediaStreams, user),
deviceId: ApiClient.deviceId(), deviceId: ApiClient.deviceId(),
Type: item.Type,
Static: false Static: false
}; };
@ -903,10 +900,6 @@
if (item.Type == "Channel") { if (item.Type == "Channel") {
errorMsg += " Please ensure there is an open tuner availalble."; errorMsg += " Please ensure there is an open tuner availalble.";
} }
if ($.browser.msie && !canPlayWebm()) {
errorMsg += " " + msieWebmMessage;
}
Dashboard.alert({ Dashboard.alert({
title: 'Video Error', title: 'Video Error',
@ -1090,12 +1083,6 @@
return; 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.playInternal(items[0], startPosition, user);
self.onPlaybackStarted(items); self.onPlaybackStarted(items);

2
dashboard-ui/scripts/site.js
View file

@ -801,7 +801,7 @@ var Dashboard = {
var webSocketUrl = "ws://" + location.hostname; var webSocketUrl = "ws://" + location.hostname;
if (systemInfo.HttpServerPortNumber != systemInfo.WebSocketPortNumber) { if (systemInfo.HttpServerPortNumber == systemInfo.WebSocketPortNumber) {
if (location.port) { if (location.port) {
webSocketUrl += ':' + location.port; webSocketUrl += ':' + location.port;