svn commit: r1087123 - /shindig/trunk/features/src/main/javascript/features/core.config.base/config.js

[jt...@apache.org]

Author: jtarrio
Date: Wed Mar 30 22:44:36 2011
New Revision: 1087123

URL: http://svn.apache.org/viewvc?rev=1087123&view=rev
Log:
Start with an empty (not undefined) configuration.

Modified:
    shindig/trunk/features/src/main/javascript/features/core.config.base/config.js

Modified: shindig/trunk/features/src/main/javascript/features/core.config.base/config.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/core.config.base/config.js?rev=1087123&r1=1087122&r2=1087123&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/core.config.base/config.js (original)
+++ shindig/trunk/features/src/main/javascript/features/core.config.base/config.js Wed Mar 30 22:44:36 2011
@@ -59,7 +59,7 @@ if (!gadgets.config) {
 gadgets.config = function() {
   var ___jsl;
   var components = {};
-  var configuration;
+  var configuration = {};
 
   function foldConfig(origConfig, updConfig) {
     for (var key in updConfig) {
@@ -221,12 +221,7 @@ gadgets.config = function() {
      */
     init: function(config, opt_noValidation) {
       ___jsl = window["___jsl"] || {};
-      if (configuration) {
-        // init(...) has already been called. Merge rather than override config.
-        foldConfig(configuration, config);
-      } else {
-        configuration = config;
-      }
+      foldConfig(configuration, config);
       augmentConfig(configuration);
       var inlineOverride = window["___config"] || {};
       foldConfig(configuration, inlineOverride);