From 393670e6c5a8b66f44ddefbe0ca502a220626538 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 31 Aug 2015 00:57:12 -0400
Subject: [PATCH] display current program in tv channel osd

---
 dashboard-ui/scripts/mediaplayer-video.js | 4 ++--
 dashboard-ui/scripts/site.js              | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 23139fe329..bff6dc8761 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -361,7 +361,7 @@
 
             var mediaControls = $("#videoPlayer");
 
-            var state = self.getPlayerStateInternal(self.currentMediaRenderer, item, self.currentMediaSource);
+            var state = self.getPlayerStateInternal(self.currentMediaRenderer, item.CurrentProgram || item, self.currentMediaSource);
 
             var url = "";
             var imageWidth = 400;
@@ -421,7 +421,7 @@
                 $('.videoTopControlsLogo', mediaControls).html('');
             }
 
-            var elem = $('.nowPlayingTabs', mediaControls).html(getNowPlayingTabsHtml(item)).lazyChildren();
+            var elem = $('.nowPlayingTabs', mediaControls).html(getNowPlayingTabsHtml(item.CurrentProgram || item)).lazyChildren();
 
             $('.nowPlayingTabButton', elem).on('click', function () {
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 518f9b9a2d..2c00f1055d 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -480,8 +480,6 @@ var Dashboard = {
 
     showLoadingMsg: function () {
 
-        console.log('showLoadingMsg');
-
         var elem = document.querySelector('.docspinner');
 
         if (elem) {
@@ -504,8 +502,6 @@ var Dashboard = {
 
     hideLoadingMsg: function () {
 
-        console.log('hideLoadingMsg');
-
         var elem = document.querySelector('.docspinner');
 
         if (elem) {