wjones/jellyfin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Tim Hobbs
2014-03-25 12:49:08 -07:00
parent 8216e6d956 d1d1cd2618
commit 3caaa0fbc2
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dashboard-ui/scripts/dashboardpage.js
+2 -3
View File
@@ -164,14 +164,13 @@
html += '<div>';
if (deviceId == connection.DeviceId) {
html += connection.Client;
html += connection.DeviceName;
} else {
html += '<a href="#" onclick="RemoteControl.showMenu({sessionId:\'' + connection.Id + '\'});">' + connection.Client + '</a>';
html += '<a href="#" onclick="RemoteControl.showMenu({sessionId:\'' + connection.Id + '\'});">' + connection.DeviceName + '</a>';
}
html += '</div>';
html += '<div>' + connection.ApplicationVersion + '</div>';
html += '<div>' + connection.DeviceName + '</div>';
html += '<div class="username">';
html += DashboardPage.getUsersHtml(connection);
dashboard-ui/scripts/itemdetailpage.js
+2 -5
View File
@@ -1075,14 +1075,11 @@
attributes.push(createAttribute("Language", stream.Language));
}
if (stream.Codec && stream.Codec != "dca") {
if (stream.Codec) {
attributes.push(createAttribute("Codec", stream.Codec.toUpperCase()));
}
if (stream.Profile && stream.Codec == "dca") {
attributes.push(createAttribute("Codec", stream.Profile.toUpperCase()));
}
else if (stream.Profile) {
if (stream.Profile) {
attributes.push(createAttribute("Profile", stream.Profile));
}