Skip to content

Commit

Permalink
Reverted how settings are loaded from changes made in cbb504c
Browse files Browse the repository at this point in the history
  • Loading branch information
mattpardee committed Apr 18, 2012
1 parent dc9faf9 commit 1a32951
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions client/core/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ module.exports = {
/**
* Initializes the settings. The settings can come from different sources:
* - Template (used for when no settings have been stored previously)
* - Parsed into the index file (by the backend - cloud9config.settings)
* - Parsed into the index file (by the backend - apf.IdeSettings)
* - LocalStorage (saved for use when starting in offline mode only)
*/
init : function(){
Expand All @@ -100,12 +100,12 @@ module.exports = {
xml = localStorage[sIdent];

// Load from template
else if (!cloud9config.settings || cloud9config.settings == "defaults")
else if (!apf.IdeSettings || apf.IdeSettings == "defaults")
xml = template

// Load from parsed settings in the index file
else if (cloud9config.settings)
xml = cloud9config.settings;
else if (apf.IdeSettings)
xml = apf.IdeSettings;

if (!xml) {
ide.addEventListener("socketMessage", function(e){
Expand Down

0 comments on commit 1a32951

Please sign in to comment.