cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 19:08:18 -07:00
Code Issues Packages Projects Releases Wiki 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
Show Stats 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;
}
if (state.PlayState.PlaySessionId) {
stopInfo.PlaySessionId = state.PlayState.PlaySessionId;
}
ApiClient.reportPlaybackStopped(stopInfo);
}).on('positionchange.mediacontroller', function (e, state) {

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

@ -1398,6 +1398,7 @@
'Transcode';
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 () {
// 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 () {