Merge branch 'master' into FLUID-5532

fluid-project · Apr 13, 2017 · 03d41dd · 03d41dd
2 parents fa84bd7 + 365e884
commit 03d41dd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/examples/framework/preferences/shared/html/slider-template.html b/examples/framework/preferences/shared/html/slider-template.html
@@ -1,7 +1,7 @@
 <div>
-    <label class="mpe-slider-label"></label>
+    <label id="mpe-slider-label" class="mpe-slider-label"></label>
     <div class="mpe-slider">
-        <input aria-labelledby="text-size-label" class="flc-textfieldSlider-slider fl-slider">
-        <input aria-labelledby="text-size-label" class="flc-textfieldSlider-field fl-textfieldSlider-textField" type="text">
+        <input aria-labelledby="mpe-slider-label" class="flc-textfieldSlider-slider fl-slider">
+        <input aria-labelledby="mpe-slider-label" class="flc-textfieldSlider-field fl-textfieldSlider-textField" type="text">
     </div>
 </div>
diff --git a/examples/framework/preferences/shared/js/panels.js b/examples/framework/preferences/shared/js/panels.js
@@ -75,9 +75,9 @@ var example = example || {};
                 createOnEvent: "onDomBind",
                 options: {
                     model: {
-                        value: "{example.panels.vol}.model.volume"
+                        value: "{example.panels.vol}.model.volume",
+                        range: "{example.panels.vol}.options.range"
                     },
-                    range: "{example.panels.vol}.options.range",
                     sliderOptions: "{example.panels.vol}.options.sliderOptions",
                     attrs: {
                         "aria-labelledby": "{example.panels.vol}.options.panelOptions.labelId"
@@ -124,9 +124,9 @@ var example = example || {};
                 createOnEvent: "afterRender",
                 options: {
                     model: {
-                        value: "{example.panels.wpm}.model.wordsPerMin"
+                        value: "{example.panels.wpm}.model.wordsPerMin",
+                        range: "{example.panels.wpm}.options.range"
                     },
-                    range: "{example.panels.wpm}.options.range",
                     sliderOptions: "{example.panels.wpm}.options.sliderOptions",
                     attrs: {
                         "aria-labelledby": "{example.panels.wpm}.options.panelOptions.labelId"
@@ -173,9 +173,9 @@ var example = example || {};
                 createOnEvent: "onDomBind",
                 options: {
                     model: {
-                        value: "{example.panels.cursor}.model.cursorMult"
+                        value: "{example.panels.cursor}.model.cursorMult",
+                        range: "{example.panels.cursor}.options.range"
                     },
-                    range: "{example.panels.cursor}.options.range",
                     sliderOptions: "{example.panels.cursor}.options.sliderOptions",
                     attrs: {
                         "aria-labelledby": "{example.panels.cursor}.options.panelOptions.labelId"
@@ -222,9 +222,9 @@ var example = example || {};
                 createOnEvent: "onDomBind",
                 options: {
                     model: {
-                        value: "{example.panels.magFactor}.model.mag"
+                        value: "{example.panels.magFactor}.model.mag",
+                        range: "{example.panels.magFactor}.options.range"
                     },
-                    range: "{example.panels.magFactor}.options.range",
                     sliderOptions: "{example.panels.magFactor}.options.sliderOptions",
                     attrs: {
                         "aria-labelledby": "{example.panels.magFactor}.options.panelOptions.labelId"

diff --git a/tests/framework-tests/preferences/js/PanelsTests.js b/tests/framework-tests/preferences/js/PanelsTests.js
@@ -1245,15 +1245,11 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         components: {
             textSize: {
                 type: "fluid.tests.prefs.panel.textSize",
-                container: ".flc-textSize"
+                container: ".flc-textSize",
+                createOnEvent: "{textSizeTester}.events.onTestCaseStart"
             },
             textSizeTester: {
-                type: "fluid.tests.textSizeTester",
-                options: {
-                    modules: [{
-                        name: "Test the text sizer settings panel"
-                    }]
-                }
+                type: "fluid.tests.textSizeTester"
             }
         }
     });
@@ -1269,7 +1265,9 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                 expect: 2,
                 name: "Test the rendering of the text size panel",
                 sequence: [{
-                    funcName: "fluid.tests.panels.utils.checkModel",
+                    event: "{fluid.tests.textSizePanel textSize}.events.afterRender",
+                    priority: "last:testing",
+                    listener: "fluid.tests.panels.utils.checkModel",
                     args: ["textSize", "{textSize}.model", 1]
                 }, {
                     func: "fluid.tests.changeInput",
@@ -1311,7 +1309,8 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         components: {
             lineSpace: {
                 type: "fluid.tests.prefs.panel.lineSpace",
-                container: ".flc-lineSpace"
+                container: ".flc-lineSpace",
+                createOnEvent: "{lineSpaceTester}.events.onTestCaseStart"
             },
             lineSpaceTester: {
                 type: "fluid.tests.lineSpaceTester",
@@ -1336,7 +1335,9 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                 name: "Test the rendering of the line space panel",
                 sequence: [
                     {
-                        funcName: "fluid.tests.panels.utils.checkModel",
+                        event: "{fluid.tests.lineSpacePanel lineSpace}.events.afterRender",
+                        priority: "last:testing",
+                        listener: "fluid.tests.panels.utils.checkModel",
                         args: ["lineSpace", "{lineSpace}.model", 1]
                     }, {
                         func: "fluid.tests.changeInput",