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

Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

Browse source
This commit is contained in:
Luke Pulverenti 2015-04-01 17:57:30 -04:00
commit 3137aa3ed4
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,6 +63,10 @@
stopInfo.LiveStreamId = state.PlayState.LiveStreamId; stopInfo.LiveStreamId = state.PlayState.LiveStreamId;
} }
if (state.PlayState.PlaySessionId) {
stopInfo.PlaySessionId = state.PlayState.PlaySessionId;
}
ApiClient.reportPlaybackStopped(stopInfo); ApiClient.reportPlaybackStopped(stopInfo);
}).on('positionchange.mediacontroller', function (e, state) { }).on('positionchange.mediacontroller', function (e, state) {

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

@ -1398,6 +1398,7 @@
'Transcode'; 'Transcode';
state.PlayState.LiveStreamId = getParameterByName('LiveStreamId', currentSrc); state.PlayState.LiveStreamId = getParameterByName('LiveStreamId', currentSrc);
state.PlayState.PlaySessionId = getParameterByName('PlaySessionId', currentSrc);
} }
} }

5
dashboard-ui/thirdparty/apiclient/connectionmanager.js vendored
View file

@ -455,7 +455,10 @@
self.isLoggedIntoConnect = function () { self.isLoggedIntoConnect = function () {
// Make sure it returns true or false // Make sure it returns true or false
return (self.connectToken() && self.connectUserId()) == true; if (!self.connectToken() || !self.connectUserId()) {
return false;
}
return true;
}; };
self.logout = function () { self.logout = function () {