decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

remove tv when going to dialog from home, hide volume control when going to tv from home (fixes #1794)

Browse source
This commit is contained in:
rolux 2013-08-10 08:58:22 +00:00
parent 4f11636623
commit 1de58ea400
6 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
static/js/appPanel.js
View file

@ -59,9 +59,7 @@ pandora.ui.appPanel = function() {
pandora.$ui[dialog + 'Dialog'].close(); pandora.$ui[dialog + 'Dialog'].close();
} }
}); });
if (pandora.$ui.tv) { pandora.$ui.tv && pandora.$ui.tv.fadeOutScreen();
pandora.$ui.tv.fadeOutScreen();
}
} else if (page == 'home') { } else if (page == 'home') {
if (pandora.$ui.appPanel) { if (pandora.$ui.appPanel) {
// unless we're on page load, show home screen // unless we're on page load, show home screen
@ -81,6 +79,8 @@ pandora.ui.appPanel = function() {
pandora.$ui[dialog + 'Dialog'].close(); 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 (Ox.getIndexById(pandora.site.sitePages, page) > -1 || page == 'software') {
if (pandora.$ui.siteDialog && pandora.$ui.siteDialog.is(':visible')) { if (pandora.$ui.siteDialog && pandora.$ui.siteDialog.is(':visible')) {
pandora.$ui.siteDialog.select(page); pandora.$ui.siteDialog.select(page);

2
static/js/home.0xdb.js
View file

@ -282,7 +282,7 @@ pandora.ui.home = function() {
that.animate({opacity: 0}, 500, function() { that.animate({opacity: 0}, 500, function() {
that.remove(); that.remove();
}); });
pandora.$ui.tv && pandora.$ui.tv.unmute(); pandora.$ui.tv && pandora.$ui.tv.unmute().find('.OxControls.OxVolume').hide();
return that; return that;
}; };

2
static/js/home.indiancinema.js
View file

@ -690,7 +690,7 @@ pandora.ui.home = function() {
that.animate({opacity: 0}, 500, function() { that.animate({opacity: 0}, 500, function() {
that.remove(); 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}); self.keydown && Ox.$document.off({keydown: self.keydown});
return that; return that;
}; };

2
static/js/home.js
View file

@ -265,7 +265,7 @@ pandora.ui.home = function() {
that.animate({opacity: 0}, 500, function() { that.animate({opacity: 0}, 500, function() {
that.remove(); that.remove();
}); });
pandora.$ui.tv && pandora.$ui.tv.unmute(); pandora.$ui.tv && pandora.$ui.tv.unmute().find('.OxControls.OxVolume').hide();
return that; return that;
}; };

2
static/js/home.padma.js
View file

@ -662,7 +662,7 @@ pandora.ui.home = function() {
that.animate({opacity: 0}, 500, function() { that.animate({opacity: 0}, 500, function() {
that.remove(); 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}); self.keydown && Ox.$document.off({keydown: self.keydown});
return that; return that;
}; };

2
static/js/tv.js
View file

@ -174,6 +174,7 @@ pandora.ui.tv = function() {
that.mute = function() { that.mute = function() {
muted = true; muted = true;
$player && $player.options({muted: muted}); $player && $player.options({muted: muted});
return that;
}; };
that.showScreen = function() { that.showScreen = function() {
@ -185,6 +186,7 @@ pandora.ui.tv = function() {
that.unmute = function() { that.unmute = function() {
$player && $player.options({muted: pandora.user.ui.videoMuted}); $player && $player.options({muted: pandora.user.ui.videoMuted});
muted = false; muted = false;
return that;
}; };
return that; return that;