forked from 0x2620/pandora
move handling home screen when loading / from url controller to app panel
This commit is contained in:
parent
5a91617f8e
commit
dde8e55507
6 changed files with 5 additions and 11 deletions
|
@ -815,7 +815,6 @@
|
|||
"showBrowser": true,
|
||||
"showCalendarControls": true, // fixme: should be false
|
||||
"showFilters": true,
|
||||
"showHome": true,
|
||||
"showIconBrowser": false,
|
||||
"showInfo": true,
|
||||
"showLayers": {
|
||||
|
|
|
@ -825,7 +825,6 @@
|
|||
"showBrowser": true,
|
||||
"showCalendarControls": true, // fixme: should be false
|
||||
"showFilters": true,
|
||||
"showHome": true,
|
||||
"showIconBrowser": false,
|
||||
"showInfo": true,
|
||||
"showLayers": {
|
||||
|
|
|
@ -704,7 +704,6 @@
|
|||
"showBrowser": true,
|
||||
"showCalendarControls": true, // fixme: should be false
|
||||
"showFilters": true,
|
||||
"showHome": true,
|
||||
"showIconBrowser": false,
|
||||
"showInfo": true,
|
||||
"showLayers": {
|
||||
|
|
|
@ -623,7 +623,6 @@
|
|||
"showBrowser": true,
|
||||
"showCalendarControls": true, // fixme: should be false
|
||||
"showFilters": true,
|
||||
"showHome": true,
|
||||
"showIconBrowser": false,
|
||||
"showInfo": true,
|
||||
"showLayers": {
|
||||
|
|
|
@ -90,9 +90,6 @@ pandora.URL = (function() {
|
|||
|
||||
if (Ox.isEmpty(state)) {
|
||||
|
||||
if (pandora.user.ui.showHome && pandora.user.ui.page != 'home') {
|
||||
pandora.$ui.home = pandora.ui.home().showScreen();
|
||||
}
|
||||
callback && callback();
|
||||
|
||||
} else {
|
||||
|
@ -226,8 +223,6 @@ pandora.URL = (function() {
|
|||
|
||||
}
|
||||
|
||||
pandora.user.ui.showHome = false;
|
||||
|
||||
}
|
||||
|
||||
that.init = function() {
|
||||
|
|
|
@ -47,8 +47,11 @@ pandora.ui.appPanel = function() {
|
|||
api: ['api']
|
||||
};
|
||||
if (page === '') {
|
||||
if (pandora.$ui.home && pandora.$ui.appPanel) {
|
||||
// unless we're on page load, remove home screen
|
||||
if (!pandora.$ui.appPanel) {
|
||||
// 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();
|
||||
}
|
||||
Ox.forEach(dialogPages, function(pages, dialog) {
|
||||
|
|
Loading…
Reference in a new issue