From 472d1ec9ac3ec3b12b6d110ec5dbf5901fcb36dc Mon Sep 17 00:00:00 2001
From: Justin Obara <obarajustin@gmail.com>
Date: Wed, 31 Jul 2013 12:21:15 -0400
Subject: [PATCH] FLUID-4907: Moved primaryBuilder to a subcomponent

Using the primary builder as a subcomponent of builder instead of being used as a grade. This works around the FLUID-5101. Also updated the demo to be initialized in manner more closely aligned with what we'd expect an integrator to use.
---
 src/components/uiOptions/js/Builder.js  | 21 ++++++++++++++-------
 src/demos/uiOptions/js/uiOptionsDemo.js | 12 ++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/components/uiOptions/js/Builder.js b/src/components/uiOptions/js/Builder.js
index 3d46590938..b870febb2a 100644
--- a/src/components/uiOptions/js/Builder.js
+++ b/src/components/uiOptions/js/Builder.js
@@ -22,7 +22,7 @@ var fluid_1_5 = fluid_1_5 || {};
     fluid.registerNamespace("fluid.uiOptions");
 
     fluid.defaults("fluid.uiOptions.builder", {
-        gradeNames: ["fluid.eventedComponent", "fluid.uiOptions.primaryBuilder", "fluid.uiOptions.auxBuilder", "autoInit"],
+        gradeNames: ["fluid.eventedComponent", "fluid.uiOptions.auxBuilder", "autoInit"],
         mergePolicy: {
             auxSchema: "expandedAuxSchema"
         },
@@ -50,13 +50,20 @@ var fluid_1_5 = fluid_1_5 || {};
                 args: ["{that}.options.auxSchema", ["enactors", "messages", "panels", "rootModel", "templateLoader", "messageLoader", "templatePrefix", "messagePrefix"]]
             }
         },
-        typeFilter: {
-            expander: {
-                func: "fluid.uiOptions.builder.parseAuxSchema",
-                args: "{that}.options.auxiliarySchema"
+        mappedDefaults: "{primaryBuilder}.options.schema.properties",
+        components: {
+            primaryBuilder: {
+                type: "fluid.uiOptions.primaryBuilder",
+                options: {
+                    typeFilter: {
+                        expander: {
+                            func: "fluid.uiOptions.builder.parseAuxSchema",
+                            args: "{builder}.options.auxiliarySchema"
+                        }
+                    },
+                }
             }
-        },
-        mappedDefaults: "{that}.options.schema.properties"
+        }
 
     });
 
diff --git a/src/demos/uiOptions/js/uiOptionsDemo.js b/src/demos/uiOptions/js/uiOptionsDemo.js
index 08b18e0072..e76bf0d61f 100644
--- a/src/demos/uiOptions/js/uiOptionsDemo.js
+++ b/src/demos/uiOptions/js/uiOptionsDemo.js
@@ -20,17 +20,9 @@ var demo = demo || {};
 (function ($, fluid) {
 
     demo.initFatPanel = function (container) {
-        // var builder = fluid.uiOptions.builder({
-        //     gradeNames: ["fluid.uiOptions.auxSchema.starter"]
-        // });
-        // fluid.invokeGlobalFunction(builder.options.assembledUIOGrade, [".flc-uiOptions-fatPanel"]);
-
-        // work around for FLUID- 5105
-        fluid.defaults("demo.uiOptions.builder", {
-            gradeNames: ["fluid.uiOptions.auxSchema.starter", "fluid.uiOptions.builder", "autoInit"]
+        var builder = fluid.uiOptions.builder({
+            gradeNames: ["fluid.uiOptions.auxSchema.starter"]
         });
-        var builder = demo.uiOptions.builder();
-        demo.builder = builder;
         fluid.invokeGlobalFunction(builder.options.assembledUIOGrade, [".flc-uiOptions-fatPanel"]);
     };