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

fix web socket attachment to session object

Browse source
This commit is contained in:
Luke Pulverenti 2013-12-26 13:46:38 -05:00
parent d9dac5269d
commit 6e4a7594fc
4 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -618,7 +618,7 @@ form, .readOnlyContent {
} }
.tblConnections img { .tblConnections img {
height: 60px; height: 54px;
} }
.clientNowPlayingImage { .clientNowPlayingImage {

2
dashboard-ui/librarysettings.html
View file

@ -4,7 +4,7 @@
<title>Media Library</title> <title>Media Library</title>
</head> </head>
<body> <body>
<div id="librarySettingsPage" data-role="page" class="page type-interior"> <div id="librarySettingsPage" data-role="page" class="page type-interior mediaLibraryPage">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

10
dashboard-ui/scripts/dashboardpage.js
View file

@ -112,7 +112,9 @@
html += '</td>'; html += '</td>';
html += '<td class="username">'; html += '<td class="username">';
html += connection.UserName || ''; if (connection.UserId) {
html += '<a href="useredit.html?userid=' + connection.UserId + '">' + connection.UserName + '</a>';
}
html += '</td>'; html += '</td>';
var nowPlayingItem = connection.NowPlayingItem; var nowPlayingItem = connection.NowPlayingItem;
@ -138,7 +140,11 @@
row.removeClass('deadSession'); row.removeClass('deadSession');
$('.username', row).html(session.UserName || ''); if (session.UserId) {
$('.username', row).html('<a href="useredit.html?userid=' + session.UserId + '">' + session.UserName + '</a>').trigger('create');
} else {
$('.username', row).html('');
}
var nowPlayingItem = session.NowPlayingItem; var nowPlayingItem = session.NowPlayingItem;

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

@ -673,7 +673,7 @@ var Dashboard = {
name: "Media Library", name: "Media Library",
divider: true, divider: true,
href: "library.html", href: "library.html",
selected: pageElem.id == "mediaLibraryPage" && !getParameterByName('userId') selected: page.hasClass("mediaLibraryPage")
}, { }, {
name: "Metadata", name: "Metadata",
href: "metadata.html", href: "metadata.html",
@ -1248,6 +1248,8 @@ $(function () {
// Close the connection gracefully when possible // Close the connection gracefully when possible
if (ApiClient.isWebSocketOpen() && !MediaPlayer.isPlaying()) { if (ApiClient.isWebSocketOpen() && !MediaPlayer.isPlaying()) {
console.log('Sending close web socket command');
ApiClient.closeWebSocket(); ApiClient.closeWebSocket();
} }
}); });