FLUID-4162: Support for out-of-order construction of autoInit creator…

… function and namespace with the same name
fluid-project · Mar 29, 2011 · 1b8c5e0 · 1b8c5e0
1 parent 91fff12
commit 1b8c5e0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/webapp/framework/core/js/Fluid.js b/src/webapp/framework/core/js/Fluid.js
@@ -822,9 +822,14 @@ var fluid = fluid || fluid_1_4;
         if (!options.initFunction) {
             fluid.fail("Cannot autoInit component " + componentName + " which does not have an initFunction defined");
         }
-        fluid.setGlobalValue(componentName, function () {
+        var creator = function() {
             return fluid.initComponent(componentName, arguments);
-        });
+        };
+        var existing = fluid.getGlobalValue(componentName);
+        if (existing) {
+            $.extend(creator, existing);
+        }
+        fluid.setGlobalValue(componentName, creator);
     };
 
     fluid.defaults("fluid.littleComponent", {

diff --git a/src/webapp/tests/framework-tests/core/js/FluidIoCTests.js b/src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
@@ -830,17 +830,20 @@ fluid.registerNamespace("fluid.tests");
         that.initFunctionRecord = [];
     };
 
-    fluid.tests.initRecordingComponent = function(that) {
+    // Test FLUID-4162 by creating namespace before component of the same name
+    fluid.registerNamespace("fluid.tests.initFunctions");
+
+    fluid.tests.initFunctions.initRecordingComponent = function(that) {
         var parent = that.options.parent;
         parent.initFunctionRecord.push(that.options.name);
     };
 
-    fluid.defaults("fluid.tests.recordingComponent", {
+    fluid.defaults("fluid.tests.initFunctions.recordingComponent", {
         gradeNames: ["fluid.littleComponent", "autoInit"],
         mergePolicy: {
             parent: "nomerge"  
         },
-        postInitFunction: fluid.tests.initRecordingComponent
+        postInitFunction: "fluid.tests.initFunctions.initRecordingComponent"
         }
     );
 
@@ -857,14 +860,14 @@ fluid.registerNamespace("fluid.tests");
         },
         components: {
             initTimeComponent: {
-                 type: "fluid.tests.recordingComponent",
+                 type: "fluid.tests.initFunctions.recordingComponent",
                  options: {
                      parent: "{initFunctions}",
                      name: "initTimeComponent"
                  }
             },
             eventTimeComponent: {
-                type: "fluid.tests.recordingComponent",
+                type: "fluid.tests.initFunctions.recordingComponent",
                 createOnEvent: "mainEvent",
                 options: {
                     parent: "{initFunctions}",