From a0ff8fc2a592a810d9f907110f9b16a6ef5ec1b2 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 1 Apr 2015 13:09:08 -0400 Subject: [PATCH 1/2] fix isLoggedIntoConnect check --- dashboard-ui/thirdparty/apiclient/connectionmanager.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dashboard-ui/thirdparty/apiclient/connectionmanager.js b/dashboard-ui/thirdparty/apiclient/connectionmanager.js index 46b3037610..c56402612f 100644 --- a/dashboard-ui/thirdparty/apiclient/connectionmanager.js +++ b/dashboard-ui/thirdparty/apiclient/connectionmanager.js @@ -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 () { From b0fe9cc1240f9c6e2ca294023117293fef327eba Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 1 Apr 2015 17:55:50 -0400 Subject: [PATCH 2/2] add missing PlaySessionId --- dashboard-ui/scripts/mediacontroller.js | 4 ++++ dashboard-ui/scripts/mediaplayer.js | 1 + 2 files changed, 5 insertions(+) diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js index c53fde76c7..0143a1b6c9 100644 --- a/dashboard-ui/scripts/mediacontroller.js +++ b/dashboard-ui/scripts/mediacontroller.js @@ -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) { diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 455ad2d8d8..6ef491ad5a 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -1398,6 +1398,7 @@ 'Transcode'; state.PlayState.LiveStreamId = getParameterByName('LiveStreamId', currentSrc); + state.PlayState.PlaySessionId = getParameterByName('PlaySessionId', currentSrc); } }