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

fixing dashboard project

Browse source
This commit is contained in:
Luke Pulverenti 2013-04-14 23:53:18 -04:00
parent 02316a115f
commit 08bd52697e
2 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -81,11 +81,7 @@
}
else if (item.MediaType == "Game") {
<<<<<<< HEAD
html += "<img class='posterDetailViewImage' style='background:" + LibraryBrowser.getMetroColor(item.Id) + ";' src='css/images/items/list/game.png' />";
=======
html += "<img class='posterDetailViewImage' style='background:" + LibraryBrowser.getMetroColor(item.Id) + ";' src='css/images/items/list/game.png' />";
>>>>>>> 103dcc97e4c89de41919ec2ab1025f8df30e87fb
}
else {

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

@ -102,9 +102,7 @@
videoBitrate: 1500000,
maxWidth: screenWidth,
maxHeight: screenHeight,
StartTimeTicks: 0,
SubtitleStreamIndex: null,
AudioStreamIndex: null
StartTimeTicks: 0
};
if (typeof (startPosition) != "undefined") {