aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEyal Kobrigo2012-12-20 08:23:40 (EST)
committerlibing wang2012-12-20 10:52:03 (EST)
commitef33152870c72a2560c0cca2142d24b97c46cdde (patch)
treeec147ce20bd2c00de5ad27a799b69e153f936b26
parentbd90f9166cdc8eea9ffb54d4e2160acb759a14d5 (diff)
downloadorg.eclipse.orion.client-ef33152870c72a2560c0cca2142d24b97c46cdde.zip
org.eclipse.orion.client-ef33152870c72a2560c0cca2142d24b97c46cdde.tar.gz
org.eclipse.orion.client-ef33152870c72a2560c0cca2142d24b97c46cdde.tar.bz2
Fixed bug 389057 in the setting page where the ui would get build twice
-rw-r--r--bundles/org.eclipse.orion.client.core/web/orion/widgets/settings/SettingsContainer.js12
-rw-r--r--modules/orionode/lib/orionode.client/orion/widgets/settings/SettingsContainer.js10
2 files changed, 19 insertions, 3 deletions
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/widgets/settings/SettingsContainer.js b/bundles/org.eclipse.orion.client.core/web/orion/widgets/settings/SettingsContainer.js
index b64e694..2225324 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/widgets/settings/SettingsContainer.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/widgets/settings/SettingsContainer.js
@@ -82,8 +82,16 @@ define(['i18n!orion/settings/nls/messages', 'require', 'dojo', 'dijit', 'orion/g
this.preferences.getPreferences('/settingsContainer', 2).then(function(prefs){
var selection = prefs.get( 'selection' );
-
+
var category = pageParams.category || selection; //$NON-NLS-0$
+
+ if(container.selectedCategory){
+ if( container.selectedCategory.id === category){
+ //No need to reselect the category
+ return;
+ }
+ }
+
container.showByCategory(category);
} );
@@ -437,4 +445,4 @@ define(['i18n!orion/settings/nls/messages', 'require', 'dojo', 'dijit', 'orion/g
initialSettings: []
});
-});
+});
diff --git a/modules/orionode/lib/orionode.client/orion/widgets/settings/SettingsContainer.js b/modules/orionode/lib/orionode.client/orion/widgets/settings/SettingsContainer.js
index a85b9f9..2ad4aa8 100644
--- a/modules/orionode/lib/orionode.client/orion/widgets/settings/SettingsContainer.js
+++ b/modules/orionode/lib/orionode.client/orion/widgets/settings/SettingsContainer.js
@@ -82,8 +82,16 @@ define(['i18n!orion/settings/nls/messages', 'require', 'dojo', 'dijit', 'orion/g
this.preferences.getPreferences('/settingsContainer', 2).then(function(prefs){
var selection = prefs.get( 'selection' );
-
+
var category = pageParams.category || selection; //$NON-NLS-0$
+
+ if(container.selectedCategory){
+ if( container.selectedCategory.id === category){
+ //No need to reselect the category
+ return;
+ }
+ }
+
container.showByCategory(category);
} );