From 1de58ea400b81b3107f89492c9fa1d08830f2c8c Mon Sep 17 00:00:00 2001
From: rolux <rolux@rollux.org>
Date: Sat, 10 Aug 2013 08:58:22 +0000
Subject: [PATCH] remove tv when going to dialog from home, hide volume control
 when going to tv from home (fixes #1794)

---
 static/js/appPanel.js          | 6 +++---
 static/js/home.0xdb.js         | 2 +-
 static/js/home.indiancinema.js | 2 +-
 static/js/home.js              | 2 +-
 static/js/home.padma.js        | 2 +-
 static/js/tv.js                | 2 ++
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/static/js/appPanel.js b/static/js/appPanel.js
index a6a17182..6c4d6cc3 100644
--- a/static/js/appPanel.js
+++ b/static/js/appPanel.js
@@ -59,9 +59,7 @@ pandora.ui.appPanel = function() {
                     pandora.$ui[dialog + 'Dialog'].close();
                 }
             });
-            if (pandora.$ui.tv) {
-                pandora.$ui.tv.fadeOutScreen();
-            }
+            pandora.$ui.tv && pandora.$ui.tv.fadeOutScreen();
         } else if (page == 'home') {
             if (pandora.$ui.appPanel) {
                 // unless we're on page load, show home screen
@@ -81,6 +79,8 @@ pandora.ui.appPanel = function() {
                     pandora.$ui[dialog + 'Dialog'].close();
                 }
             });
+            // remove tv (may be active behind home screen)
+            pandora.$ui.tv && pandora.$ui.tv.remove();
             if (Ox.getIndexById(pandora.site.sitePages, page) > -1 || page == 'software') {
                 if (pandora.$ui.siteDialog && pandora.$ui.siteDialog.is(':visible')) {
                     pandora.$ui.siteDialog.select(page);
diff --git a/static/js/home.0xdb.js b/static/js/home.0xdb.js
index 1614b692..74b40ee7 100644
--- a/static/js/home.0xdb.js
+++ b/static/js/home.0xdb.js
@@ -282,7 +282,7 @@ pandora.ui.home = function() {
         that.animate({opacity: 0}, 500, function() {
             that.remove();
         });
-        pandora.$ui.tv && pandora.$ui.tv.unmute();
+        pandora.$ui.tv && pandora.$ui.tv.unmute().find('.OxControls.OxVolume').hide();
         return that;
     };
 
diff --git a/static/js/home.indiancinema.js b/static/js/home.indiancinema.js
index fcb4a0e3..741daadb 100644
--- a/static/js/home.indiancinema.js
+++ b/static/js/home.indiancinema.js
@@ -690,7 +690,7 @@ pandora.ui.home = function() {
         that.animate({opacity: 0}, 500, function() {
             that.remove();
         });
-        pandora.$ui.tv && pandora.$ui.tv.unmute();
+        pandora.$ui.tv && pandora.$ui.tv.unmute().find('.OxControls.OxVolume').hide();
         self.keydown && Ox.$document.off({keydown: self.keydown});
         return that;
     };
diff --git a/static/js/home.js b/static/js/home.js
index 84582e79..300c57e2 100644
--- a/static/js/home.js
+++ b/static/js/home.js
@@ -265,7 +265,7 @@ pandora.ui.home = function() {
         that.animate({opacity: 0}, 500, function() {
             that.remove();
         });
-        pandora.$ui.tv && pandora.$ui.tv.unmute();
+        pandora.$ui.tv && pandora.$ui.tv.unmute().find('.OxControls.OxVolume').hide();
         return that;
     };
 
diff --git a/static/js/home.padma.js b/static/js/home.padma.js
index 9f285afc..b35d9756 100644
--- a/static/js/home.padma.js
+++ b/static/js/home.padma.js
@@ -662,7 +662,7 @@ pandora.ui.home = function() {
         that.animate({opacity: 0}, 500, function() {
             that.remove();
         });
-        pandora.$ui.tv && pandora.$ui.tv.unmute();
+        pandora.$ui.tv && pandora.$ui.tv.unmute().find('.OxControls.OxVolume').hide();
         self.keydown && Ox.$document.off({keydown: self.keydown});
         return that;
     };
diff --git a/static/js/tv.js b/static/js/tv.js
index bb0aca12..42858548 100644
--- a/static/js/tv.js
+++ b/static/js/tv.js
@@ -174,6 +174,7 @@ pandora.ui.tv = function() {
     that.mute = function() {
         muted = true;
         $player && $player.options({muted: muted});
+        return that;
     };
 
     that.showScreen = function() {
@@ -185,6 +186,7 @@ pandora.ui.tv = function() {
     that.unmute = function() {
         $player && $player.options({muted: pandora.user.ui.videoMuted});
         muted = false;
+        return that;
     };
 
     return that;