From 5a91617f8e54609678b9a10fc40d9ed818d87437 Mon Sep 17 00:00:00 2001 From: rolux Date: Mon, 8 Jul 2013 17:27:24 +0000 Subject: [PATCH] actual fix for home screen issue --- pandora/config.0xdb.jsonc | 1 + pandora/config.indiancinema.jsonc | 1 + pandora/config.padma.jsonc | 1 + pandora/config.pandora.jsonc | 1 + static/js/pandora/URL.js | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pandora/config.0xdb.jsonc b/pandora/config.0xdb.jsonc index 8b39c6a9..7b278334 100644 --- a/pandora/config.0xdb.jsonc +++ b/pandora/config.0xdb.jsonc @@ -815,6 +815,7 @@ "showBrowser": true, "showCalendarControls": true, // fixme: should be false "showFilters": true, + "showHome": true, "showIconBrowser": false, "showInfo": true, "showLayers": { diff --git a/pandora/config.indiancinema.jsonc b/pandora/config.indiancinema.jsonc index 519993df..4ffb54c3 100644 --- a/pandora/config.indiancinema.jsonc +++ b/pandora/config.indiancinema.jsonc @@ -825,6 +825,7 @@ "showBrowser": true, "showCalendarControls": true, // fixme: should be false "showFilters": true, + "showHome": true, "showIconBrowser": false, "showInfo": true, "showLayers": { diff --git a/pandora/config.padma.jsonc b/pandora/config.padma.jsonc index 1a29fb0c..e6b2e710 100644 --- a/pandora/config.padma.jsonc +++ b/pandora/config.padma.jsonc @@ -704,6 +704,7 @@ "showBrowser": true, "showCalendarControls": true, // fixme: should be false "showFilters": true, + "showHome": true, "showIconBrowser": false, "showInfo": true, "showLayers": { diff --git a/pandora/config.pandora.jsonc b/pandora/config.pandora.jsonc index efdc4ac8..5919811e 100644 --- a/pandora/config.pandora.jsonc +++ b/pandora/config.pandora.jsonc @@ -623,6 +623,7 @@ "showBrowser": true, "showCalendarControls": true, // fixme: should be false "showFilters": true, + "showHome": true, "showIconBrowser": false, "showInfo": true, "showLayers": { diff --git a/static/js/pandora/URL.js b/static/js/pandora/URL.js index ce7b82ea..ff0724c7 100644 --- a/static/js/pandora/URL.js +++ b/static/js/pandora/URL.js @@ -90,7 +90,7 @@ pandora.URL = (function() { if (Ox.isEmpty(state)) { - if (pandora.user.ui.page == '') { + if (pandora.user.ui.showHome && pandora.user.ui.page != 'home') { pandora.$ui.home = pandora.ui.home().showScreen(); } callback && callback();