Merge remote-tracking branch 'yura/FLUID-4907' into FLUID-4907

fluid-project · Jul 24, 2013 · 2127160 · 2127160
2 parents 01202de + c004b60
commit 2127160
Show file tree

Hide file tree

Showing 5 changed files with 365 additions and 331 deletions.
diff --git a/src/webapp/components/uiOptions/js/Panels.js b/src/webapp/components/uiOptions/js/Panels.js
@@ -117,31 +117,26 @@ var fluid_1_5 = fluid_1_5 || {};
         strings: {
             textFont: "{that}.options.parentBundle.messageBase.textFont"
         },
-        produceTree: "fluid.uiOptions.panels.textFont.produceTree",
-        classnameMap: null, // must be supplied by implementors
-        controlValues: {
-            textFont: ["default", "times", "comic", "arial", "verdana"]
-        }
-    });
-
-    fluid.uiOptions.panels.textFont.produceTree = function (that) {
-        // render drop down list box
-        return {
+        protoTree: {
             label: {messagekey: "textFontLabel"},
             textFont: {
-                optionnames: that.options.strings.textFont,
-                optionlist: that.options.controlValues.textFont,
+                optionnames: "{that}.options.strings.textFont",
+                optionlist: "{that}.options.controlValues.textFont",
                 selection: "${value}",
                 decorators: {
                     type: "fluid",
                     func: "fluid.uiOptions.selectDecorator",
                     options: {
-                        styles: that.options.classnameMap.textFont
+                        styles: "{that}.options.classnameMap.textFont"
                     }
                 }
             }
-        };
-    };
+        },
+        classnameMap: null, // must be supplied by implementors
+        controlValues: {
+            textFont: ["default", "times", "comic", "arial", "verdana"]
+        }
+    });
 
     /*************************
      * UI Options Line Space *
@@ -220,7 +215,21 @@ var fluid_1_5 = fluid_1_5 || {};
             theme: "{that}.options.parentBundle.messageBase.theme"
         },
         repeatingSelectors: ["themeRow"],
-        produceTree: "fluid.uiOptions.panels.contrast.produceTree",
+        protoTree: {
+            label: {messagekey: "contrastLabel"},
+            expander: {
+                type: "fluid.renderer.selection.inputs",
+                rowID: "themeRow",
+                labelID: "themeLabel",
+                inputID: "themeInput",
+                selectID: "theme-radio",
+                tree: {
+                    optionnames: "{that}.options.strings.theme",
+                    optionlist: "{that}.options.controlValues.theme",
+                    selection: "${value}"
+                }
+            }
+        },
         controlValues: {
             theme: ["default", "bw", "wb", "by", "yb"]
         },
@@ -247,24 +256,6 @@ var fluid_1_5 = fluid_1_5 || {};
         });
     };
 
-    fluid.uiOptions.panels.contrast.produceTree = function (that) {
-        return {
-            label: {messagekey: "contrastLabel"},
-            expander: {
-                type: "fluid.renderer.selection.inputs",
-                rowID: "themeRow",
-                labelID: "themeLabel",
-                inputID: "themeInput",
-                selectID: "theme-radio",
-                tree: {
-                    optionnames: that.options.strings.theme,
-                    optionlist: that.options.controlValues.theme,
-                    selection: "${value}"
-                }
-            }
-        };
-    };
-
     /******************************
      * UI Options Layout Controls *
      ******************************/