Merge branch 'master' into FLUID-5131

Conflicts:
	src/components/uiOptions/js/StarterSchemas.js
	src/demos/prefsEditor/html/prefsEditor.html
	src/framework/preferences/js/AuxBuilder.js
	src/framework/preferences/js/Panels.js
	src/framework/preferences/js/StarterGrades.js
	src/tests/framework-tests/preferences/js/AuxBuilderTests.js
	src/tests/framework-tests/preferences/js/BuilderTests.js
	src/tests/framework-tests/preferences/js/PanelsTests.js
	src/tests/framework-tests/preferences/js/PrefsEditorTests.js

.gitignore

@@ -1,3 +1,3 @@
 build/
 products/
-src/components/uiOptions/css/fss/
+src/framework/preferences/css/fss/

build-scripts/build.properties

@@ -22,19 +22,21 @@ group_description-lib=Third party javascript libraries required by Infusion comp
 
 <!-- Infusion Framework Modules -->
 module_framework=framework/core
+module_enhancement=framework/enhancement
 module_fss=framework/fss
+module_preferences=framework/preferences
 module_renderer=framework/renderer
-module_enhancement=framework/enhancement
 
 <!-- Infusion Component Modules -->
 module_inlineEdit=components/inlineEdit
 module_pager=components/pager
 module_progress=components/progress
 module_reorderer=components/reorderer
+module_slidingPanel=components/slidingPanel
 module_tabs=components/tabs
 module_tableOfContents=components/tableOfContents
+module_textfieldSlider=components/textfieldSlider
 module_tooltip=components/tooltip
-module_uiOptions=components/uiOptions
 module_undo=components/undo
 module_uploader=components/uploader
 
@@ -74,7 +76,7 @@ src=${base-dir}/src
 working=${build}/working
 web-inf=${base-dir}/src/WEB-INF
 lint=${src}
-fssImportant=${src}/components/uiOptions/css/fss
+fssImportant=${src}/framework/preferences/css/fss
 
 <!-- the filename for the package to output -->
 zipfile=infusion-${fluid_version}

build-scripts/build.xml

@@ -7,7 +7,7 @@
       To jsLint source code within a specific directory, type: ant validate -Dlint="../some/folder"
       To create a custom build use the customBuild target.
         Custom build has three optional parameters:  'include', 'exclude', and 'jsfilename'
-        e.g. ant customBuild -Dinclude="uiOptions, inlineEdit" -Dexclude="jQuery" -Djsfilename="MyInfusion.js"
+        e.g. ant customBuild -Dinclude="preferences, inlineEdit" -Dexclude="jQuery" -Djsfilename="MyInfusion.js"
       To create an unminified package when using the customBuild, builderBuild and releaseBuild targets, use -DnoMinify="true"
 
     </description>
@@ -69,9 +69,9 @@
         </condition>
     </target>
 
-    <!-- UI Options style sheet creation / !important injection -->
-    <target name="generateUIOThemes" depends="init" description="Namespace and inject !important into UI Options' stylesheets">
-        <property name="buildJSDir" value="${buildDir}/uiOptions/js" />
+    <!-- Preference editor style sheet creation / !important injection -->
+    <target name="generatePrefsEditorThemes" depends="init" description="Namespace and inject !important into Preference Editor's stylesheets">
+        <property name="buildJSDir" value="${buildDir}/prefsFramework/js" />
         <property name="jscssp" value="${buildDir}/lib/jscssp/js/jscssp.js" />
         <property name="evalScripts" value="${jscssp}, ${buildJSDir}/CSSGenerator.js, ${buildJSDir}/RhinoStylesheetHandler.js, ${buildJSDir}/StylesheetImportant.js" />
         <script language="javascript" src="${buildDir}/build-core.js" manager="bsf">
@@ -179,19 +179,19 @@
 
     <!-- Top level targets -->
 
-    <target name="customBuild" depends="clean, init, generateUIOThemes, setPretreat, setSourceDir, maybeMinify, resolveDependencies, assemble, zip"
+    <target name="customBuild" depends="clean, init, generatePrefsEditorThemes, setPretreat, setSourceDir, maybeMinify, resolveDependencies, assemble, zip"
         description="Builds a custom package of Infusion containing the modules specified as command line arguments.">
     </target>
 
-    <target name="pretreatMinify" depends="clean, init, generateUIOThemes, alwaysMinify"
+    <target name="pretreatMinify" depends="clean, init, generatePrefsEditorThemes, alwaysMinify"
         description="Minifies everything to prepare for builds done from pretreated source">
     </target>
 
     <target name="builderBuild" depends="cleanExceptPretreat, init, setPretreat, setSourceDir, resolveDependencies, assemble, zip"
         description="Builds a custom package of Infusion containing the modules specified by the builder - expects pretreatMinify to have been run before.">
     </target>
 
-    <target name="releaseBuild" depends="cleanExceptProducts, init, generateUIOThemes, setPretreat, setSourceDir, maybeMinify, resolveDependencies, assembleFull, zip"
+    <target name="releaseBuild" depends="cleanExceptProducts, init, generatePrefsEditorThemes, setPretreat, setSourceDir, maybeMinify, resolveDependencies, assembleFull, zip"
         description="Builds and packages a release bundle of Infusion"/>
 
     <target name="releaseBuilds" depends="clean"

build-scripts/uiOptions/js/StylesheetImportant.js → build-scripts/prefsFramework/js/StylesheetImportant.js

@@ -12,7 +12,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 // Declare dependencies
 /*global fluid, jqUnit, expect, jQuery, start*/
 
-// JSLint options 
+// JSLint options
 /*jslint white: true, funcinvoke: true, undef: true, newcap: true, nomen: true, regexp: true, bitwise: true, browser: true, forin: true, maxerr: 100, indent: 4 */
 
 var fluid = fluid || {};
@@ -23,20 +23,20 @@ var fluid = fluid || {};
         var generator = fluid.build.cssGenerator({
             sheetStore: sheetStore
         });
-        
+
         generator.processRules([
             {
                 type: fluid.build.cssGenerator.prioritize,
                 options: {
                     "fluid-cssGenerator-allRules": [
-                        "font-size", 
-                        "line-height", 
-                        "font-family", 
-                        "color", 
-                        "background-color", 
-                        "background-image", 
-                        "background", 
-                        "border", 
+                        "font-size",
+                        "line-height",
+                        "font-family",
+                        "color",
+                        "background-color",
+                        "background-image",
+                        "background",
+                        "border",
                         "border-color",
                         "border-bottom-color",
                         "border-top-color",
@@ -52,14 +52,14 @@ var fluid = fluid || {};
                 type: fluid.build.cssGenerator.rewriteSelector,
                 options: {
                     match: "fl-theme-",
-                    replace: "fl-theme-uio-"
+                    replace: "fl-theme-prefsEditor-"
                 }
             },
             {
                 type: fluid.build.cssGenerator.rewriteSelector,
                 options: {
                     match: "fl-font-",
-                    replace: "fl-font-uio-"
+                    replace: "fl-font-prefsEditor-"
                 }
             },
             {
@@ -69,7 +69,7 @@ var fluid = fluid || {};
                 }
             }
         ]);
-        
+
         // Now that the stylesheet has been prioritized, generate
         // the new stylesheet and write the contents out to a file
         var modifiedStylesheet = generator.generate();
@@ -80,19 +80,19 @@ var fluid = fluid || {};
     var moduleOpts = fluid.build.readJSONFile(importantInjectionModule);
     var files = moduleOpts.files,
         i;
-        
+
     // Make them absolute.
     for (i = 0; i < files.length; i++) {
         files[i] = project.getProperty("base-dir") + "/" + files[i];
     }
-    
+
     var generateWritePath = function (originalPath) {
         var startIdx = Math.max(originalPath.lastIndexOf("/"), 0);
         var fileName = originalPath.substring(startIdx);
-        
-        return fssImportant + fileName.replace(".css", "-uio.css");
+
+        return fssImportant + fileName.replace(".css", "-prefsEditor.css");
     };
-     
+
     for (i = 0; i < files.length; i++) {
         var filePath = files[i];
         fluid.build.log("Generating an !important theme for " + files[i]);

src/components/slidingPanel/slidingPanelDependencies.json

@@ -0,0 +1,9 @@
+{
+    "slidingPanel": {
+        "name": "Sliding Panel",
+        "description": "A widget that slides a panel in and out of view.",
+        "cssFiles": [],
+        "files": ["SlidingPanel.js"],
+        "dependencies": ["jQuery", "jQueryUICore", "framework"]
+    }
+}

src/components/textfieldSlider/textfieldSliderDependencies.json

@@ -0,0 +1,9 @@
+{
+    "textfieldSlider": {
+        "name": "Textfield Slider",
+        "description": "A synchronized slider and textfield",
+        "cssFiles": [],
+        "files": ["TextfieldSlider.js"],
+        "dependencies": ["jQuery", "jQueryUICore", "framework", "jQueryUIWidgets", "jQueryTouchPunchPlugin"]
+    }
+}