0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

move handling home screen when loading / from url controller to app panel

Browse source
This commit is contained in:
rolux 2013-07-08 17:51:53 +00:00
parent 5a91617f8e
commit dde8e55507
6 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pandora/config.0xdb.jsonc
View file

@ -815,7 +815,6 @@
"showBrowser": true, "showBrowser": true,
"showCalendarControls": true, // fixme: should be false "showCalendarControls": true, // fixme: should be false
"showFilters": true, "showFilters": true,
"showHome": true,
"showIconBrowser": false, "showIconBrowser": false,
"showInfo": true, "showInfo": true,
"showLayers": { "showLayers": {

1
pandora/config.indiancinema.jsonc
View file

@ -825,7 +825,6 @@
"showBrowser": true, "showBrowser": true,
"showCalendarControls": true, // fixme: should be false "showCalendarControls": true, // fixme: should be false
"showFilters": true, "showFilters": true,
"showHome": true,
"showIconBrowser": false, "showIconBrowser": false,
"showInfo": true, "showInfo": true,
"showLayers": { "showLayers": {

1
pandora/config.padma.jsonc
View file

@ -704,7 +704,6 @@
"showBrowser": true, "showBrowser": true,
"showCalendarControls": true, // fixme: should be false "showCalendarControls": true, // fixme: should be false
"showFilters": true, "showFilters": true,
"showHome": true,
"showIconBrowser": false, "showIconBrowser": false,
"showInfo": true, "showInfo": true,
"showLayers": { "showLayers": {

1
pandora/config.pandora.jsonc
View file

@ -623,7 +623,6 @@
"showBrowser": true, "showBrowser": true,
"showCalendarControls": true, // fixme: should be false "showCalendarControls": true, // fixme: should be false
"showFilters": true, "showFilters": true,
"showHome": true,
"showIconBrowser": false, "showIconBrowser": false,
"showInfo": true, "showInfo": true,
"showLayers": { "showLayers": {

5
static/js/pandora/URL.js
View file

@ -90,9 +90,6 @@ pandora.URL = (function() {
if (Ox.isEmpty(state)) { if (Ox.isEmpty(state)) {
if (pandora.user.ui.showHome && pandora.user.ui.page != 'home') {
pandora.$ui.home = pandora.ui.home().showScreen();
}
callback && callback(); callback && callback();
} else { } else {
@ -226,8 +223,6 @@ pandora.URL = (function() {
} }
pandora.user.ui.showHome = false;
} }
that.init = function() { that.init = function() {

7
static/js/pandora/appPanel.js
View file

@ -47,8 +47,11 @@ pandora.ui.appPanel = function() {
api: ['api'] api: ['api']
}; };
if (page === '') { if (page === '') {
if (pandora.$ui.home && pandora.$ui.appPanel) { if (!pandora.$ui.appPanel) {
// unless we're on page load, remove home screen // if we're on page load, show home screen
pandora.$ui.home = pandora.ui.home().showScreen();
} else {
// otherwise, remove home screen
pandora.$ui.home.fadeOutScreen(); pandora.$ui.home.fadeOutScreen();
} }
Ox.forEach(dialogPages, function(pages, dialog) { Ox.forEach(dialogPages, function(pages, dialog) {