FLUID-5536: Cleaned up for jQuery Slider removal

Cleaned up templates, context awareness checks, and tests.
fluid-project · Jan 26, 2017 · 3b4a4b5 · 3b4a4b5
1 parent a891990
commit 3b4a4b5
Show file tree

Hide file tree

Showing 37 changed files with 85 additions and 1,340 deletions.
diff --git a/demos/prefsFramework/templates/FatPanelUIOptions.html b/demos/prefsFramework/templates/FatPanelUIOptions.html
diff --git a/demos/prefsFramework/templates/UIOptionsTemplate-selfVoicing.html b/demos/prefsFramework/templates/UIOptionsTemplate-selfVoicing.html
diff --git a/demos/prefsFramework/templates/UIOptionsTemplate-simplifiedContent.html b/demos/prefsFramework/templates/UIOptionsTemplate-simplifiedContent.html
diff --git a/...onalAdjusters-singlePanel/nativeHTML.html → ...nditionalAdjusters-singlePanel/index.html b/...onalAdjusters-singlePanel/nativeHTML.html → ...nditionalAdjusters-singlePanel/index.html
@@ -49,7 +49,6 @@
 
         <script type="text/javascript" src="../shared/js/primarySchema.js"></script>
         <script type="text/javascript" src="../shared/js/utilities.js"></script>
-        <script type="text/javascript" src="../shared/js/contextAwareAuxSchemas.js"></script>
         <script type="text/javascript" src="js/auxiliarySchema.js"></script>
         <script type="text/javascript" src="../shared/js/panels.js"></script>
         <script type="text/javascript" src="js/panels.js"></script>

diff --git a/examples/framework/preferences/conditionalAdjusters-singlePanel/jQueryUI.html b/examples/framework/preferences/conditionalAdjusters-singlePanel/jQueryUI.html
diff --git a/examples/framework/preferences/conditionalAdjusters-singlePanel/js/auxiliarySchema.js b/examples/framework/preferences/conditionalAdjusters-singlePanel/js/auxiliarySchema.js
@@ -19,19 +19,7 @@ var example = example || {};
      * Auxiliary Schema
      */
     fluid.defaults("example.auxSchema", {
-        gradeNames: ["fluid.prefs.auxSchema", "fluid.contextAware"],
-        contextAwareness: {
-            sliderVariety: {
-                checks: {
-                    jQueryUI: {
-                        contextValue: "{fluid.prefsWidgetType}",
-                        equals: "jQueryUI",
-                        gradeNames: "example.auxSchema.jQueryUI"
-                    }
-                },
-                defaultGradeNames: "example.auxSchema.nativeHTML"
-            }
-        },
+        gradeNames: ["fluid.prefs.auxSchema"],
         auxiliarySchema: {
             template: "html/prefsEditor.html",
             message: "%messagePrefix/prefsEditor.json",
@@ -68,7 +56,8 @@ var example = example || {};
                 panel: {
                     type: "example.panels.vol",
                     container: ".mpe-speaking-vol",
-                    message: "%messagePrefix/speakIncrease.json"
+                    message: "%messagePrefix/speakIncrease.json",
+                    template: "%templatePrefix/slider-template.html"
                 }
             },
             wpm: {
@@ -79,7 +68,8 @@ var example = example || {};
                 panel: {
                     type: "example.panels.wpm",
                     container: ".mpe-speaking-wpm",
-                    message: "%messagePrefix/speakIncrease.json"
+                    message: "%messagePrefix/speakIncrease.json",
+                    template: "%templatePrefix/slider-template.html"
                 }
             },
             incSize: {
@@ -102,7 +92,8 @@ var example = example || {};
                 panel: {
                     type: "example.panels.cursor",
                     container: ".mpe-increasing-cursor",
-                    message: "%messagePrefix/speakIncrease.json"
+                    message: "%messagePrefix/speakIncrease.json",
+                    template: "%templatePrefix/slider-template.html"
                 }
             },
             magFactor: {
@@ -113,7 +104,8 @@ var example = example || {};
                 panel: {
                     type: "example.panels.magFactor",
                     container: ".mpe-increasing-magFactor",
-                    message: "%messagePrefix/speakIncrease.json"
+                    message: "%messagePrefix/speakIncrease.json",
+                    template: "%templatePrefix/slider-template.html"
                 }
             },
             magPos: {

diff --git a/...nces/conditionalAdjusters/nativeHTML.html → ...eferences/conditionalAdjusters/index.html b/...nces/conditionalAdjusters/nativeHTML.html → ...eferences/conditionalAdjusters/index.html
@@ -49,7 +49,6 @@
 
         <script type="text/javascript" src="../shared/js/primarySchema.js"></script>
         <script type="text/javascript" src="../shared/js/utilities.js"></script>
-        <script type="text/javascript" src="../shared/js/contextAwareAuxSchemas.js"></script>
         <script type="text/javascript" src="js/auxiliarySchema.js"></script>
         <script type="text/javascript" src="../shared/js/panels.js"></script>
         <script type="text/javascript" src="js/panels.js"></script>

diff --git a/examples/framework/preferences/conditionalAdjusters/jQueryUI.html b/examples/framework/preferences/conditionalAdjusters/jQueryUI.html