From 3b4a4b56560647c3c42442015400f7e10e4a7671 Mon Sep 17 00:00:00 2001 From: Justin Obara Date: Thu, 26 Jan 2017 10:59:52 -0500 Subject: [PATCH] FLUID-5536: Cleaned up for jQuery Slider removal Cleaned up templates, context awareness checks, and tests. --- .../templates/FatPanelUIOptions.html | 14 - .../UIOptionsTemplate-selfVoicing.html | 12 - .../UIOptionsTemplate-simplifiedContent.html | 12 - .../{nativeHTML.html => index.html} | 1 - .../jQueryUI.html | 96 ------ .../js/auxiliarySchema.js | 26 +- .../{nativeHTML.html => index.html} | 1 - .../conditionalAdjusters/jQueryUI.html | 95 ------ .../js/auxiliarySchema.js | 26 +- ...paratedPanelPrefsEditorFrame-jQueryUI.html | 26 -- ...ml => SeparatedPanelPrefsEditorFrame.html} | 0 .../shared/html/slider-template-jQueryUI.html | 9 - ...e-nativeHTML.html => slider-template.html} | 0 .../shared/js/contextAwareAuxSchemas.js | 75 ----- ...refsEditorTemplate-lineSpace-jQueryUI.html | 12 - ...tml => PrefsEditorTemplate-lineSpace.html} | 0 ...PrefsEditorTemplate-textSize-jQueryUI.html | 15 - ...html => PrefsEditorTemplate-textSize.html} | 0 ...paratedPanelPrefsEditorFrame-jQueryUI.html | 34 -- ...ml => SeparatedPanelPrefsEditorFrame.html} | 0 .../js/SeparatedPanelPrefsEditor.js | 14 +- src/framework/preferences/js/StarterGrades.js | 30 +- .../preferences/js/StarterSchemas.js | 144 ++------- .../textToSpeech/js/TextToSpeechTests.js | 20 -- .../html/TextfieldSlider-test.html | 1 - ...ml => SeparatedPanelPrefsEditorFrame.html} | 0 .../js/CompositePanelTestsGrades.js | 2 +- .../preferences/js/PanelsTests.js | 185 +---------- .../js/SeparatedPanelPrefsEditorTests.js | 4 +- .../preferences/js/URLUtilitiesTests.js | 12 +- .../assortedContent/index-jQueryUI.html | 297 ------------------ .../{index-nativeHTML.html => index.html} | 0 .../assortedContent/js/assortedContent.js | 35 +-- .../fullPage-schema/index-jQueryUI.html | 115 ------- .../{index-nativeHTML.html => index.html} | 0 .../preferences/fullPage/index-jQueryUI.html | 112 ------- .../{index-nativeHTML.html => index.html} | 0 37 files changed, 85 insertions(+), 1340 deletions(-) delete mode 100644 demos/prefsFramework/templates/FatPanelUIOptions.html delete mode 100644 demos/prefsFramework/templates/UIOptionsTemplate-selfVoicing.html delete mode 100644 demos/prefsFramework/templates/UIOptionsTemplate-simplifiedContent.html rename examples/framework/preferences/conditionalAdjusters-singlePanel/{nativeHTML.html => index.html} (98%) delete mode 100644 examples/framework/preferences/conditionalAdjusters-singlePanel/jQueryUI.html rename examples/framework/preferences/conditionalAdjusters/{nativeHTML.html => index.html} (98%) delete mode 100644 examples/framework/preferences/conditionalAdjusters/jQueryUI.html delete mode 100644 examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html rename examples/framework/preferences/shared/html/{SeparatedPanelPrefsEditorFrame-nativeHTML.html => SeparatedPanelPrefsEditorFrame.html} (100%) delete mode 100644 examples/framework/preferences/shared/html/slider-template-jQueryUI.html rename examples/framework/preferences/shared/html/{slider-template-nativeHTML.html => slider-template.html} (100%) delete mode 100644 examples/framework/preferences/shared/js/contextAwareAuxSchemas.js delete mode 100644 src/framework/preferences/html/PrefsEditorTemplate-lineSpace-jQueryUI.html rename src/framework/preferences/html/{PrefsEditorTemplate-lineSpace-nativeHTML.html => PrefsEditorTemplate-lineSpace.html} (100%) delete mode 100644 src/framework/preferences/html/PrefsEditorTemplate-textSize-jQueryUI.html rename src/framework/preferences/html/{PrefsEditorTemplate-textSize-nativeHTML.html => PrefsEditorTemplate-textSize.html} (100%) delete mode 100644 src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html rename src/framework/preferences/html/{SeparatedPanelPrefsEditorFrame-nativeHTML.html => SeparatedPanelPrefsEditorFrame.html} (100%) rename tests/framework-tests/preferences/html/{SeparatedPanelPrefsEditorFrame-nativeHTML.html => SeparatedPanelPrefsEditorFrame.html} (100%) delete mode 100644 tests/manual-tests/framework/preferences/assortedContent/index-jQueryUI.html rename tests/manual-tests/framework/preferences/assortedContent/{index-nativeHTML.html => index.html} (100%) delete mode 100644 tests/manual-tests/framework/preferences/fullPage-schema/index-jQueryUI.html rename tests/manual-tests/framework/preferences/fullPage-schema/{index-nativeHTML.html => index.html} (100%) delete mode 100644 tests/manual-tests/framework/preferences/fullPage/index-jQueryUI.html rename tests/manual-tests/framework/preferences/fullPage/{index-nativeHTML.html => index.html} (100%) diff --git a/demos/prefsFramework/templates/FatPanelUIOptions.html b/demos/prefsFramework/templates/FatPanelUIOptions.html deleted file mode 100644 index d47ff23551..0000000000 --- a/demos/prefsFramework/templates/FatPanelUIOptions.html +++ /dev/null @@ -1,14 +0,0 @@ -
-
-
    -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
-
-
diff --git a/demos/prefsFramework/templates/UIOptionsTemplate-selfVoicing.html b/demos/prefsFramework/templates/UIOptionsTemplate-selfVoicing.html deleted file mode 100644 index 993ff8380f..0000000000 --- a/demos/prefsFramework/templates/UIOptionsTemplate-selfVoicing.html +++ /dev/null @@ -1,12 +0,0 @@ -
-

-
- - -
-
Enable the page to speak itself out loud.
-
diff --git a/demos/prefsFramework/templates/UIOptionsTemplate-simplifiedContent.html b/demos/prefsFramework/templates/UIOptionsTemplate-simplifiedContent.html deleted file mode 100644 index cf32dd05ce..0000000000 --- a/demos/prefsFramework/templates/UIOptionsTemplate-simplifiedContent.html +++ /dev/null @@ -1,12 +0,0 @@ -
-

-
- - -
-
Prioritize the main content of the page.
-
diff --git a/examples/framework/preferences/conditionalAdjusters-singlePanel/nativeHTML.html b/examples/framework/preferences/conditionalAdjusters-singlePanel/index.html similarity index 98% rename from examples/framework/preferences/conditionalAdjusters-singlePanel/nativeHTML.html rename to examples/framework/preferences/conditionalAdjusters-singlePanel/index.html index 56b8ba63f1..86e80a68a4 100644 --- a/examples/framework/preferences/conditionalAdjusters-singlePanel/nativeHTML.html +++ b/examples/framework/preferences/conditionalAdjusters-singlePanel/index.html @@ -49,7 +49,6 @@ - diff --git a/examples/framework/preferences/conditionalAdjusters-singlePanel/jQueryUI.html b/examples/framework/preferences/conditionalAdjusters-singlePanel/jQueryUI.html deleted file mode 100644 index 8325c93ad3..0000000000 --- a/examples/framework/preferences/conditionalAdjusters-singlePanel/jQueryUI.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - Preferences Editor Example: Conditional Adjusters - Single Panel - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - -
- - - - -
-
- - - - -
-

Test of Composite Panels With Conditional Show/Hide of Adjusters

-

This example illustrates a single composite panel with a collection of adjusters that are dependent on one of two boolean adjusters.

-

Initially*, you should see only two on/off switches in the panel. Turning one preference on should reveal dependent adjusters, and turning the preference off should hide them. Each of the two preferences has its own set of dependent adjusters.

-

Turning one preference on and off should not affect the visibility of the other boolean's dependent adjusters.

-

Any values set with the dependent adjusters should be preserved even if the controlling preference is turned off.

-

* Once the page is loaded, preference values are stored in a cookie, so on subsequent page loads the stored values will be used. To reset the example to its default state, clear cookies for the page.

-
- - diff --git a/examples/framework/preferences/conditionalAdjusters-singlePanel/js/auxiliarySchema.js b/examples/framework/preferences/conditionalAdjusters-singlePanel/js/auxiliarySchema.js index d2815ddd87..33cf97c2b8 100644 --- 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/examples/framework/preferences/conditionalAdjusters/nativeHTML.html b/examples/framework/preferences/conditionalAdjusters/index.html similarity index 98% rename from examples/framework/preferences/conditionalAdjusters/nativeHTML.html rename to examples/framework/preferences/conditionalAdjusters/index.html index 1f62ea4d0d..cfde3528f9 100644 --- a/examples/framework/preferences/conditionalAdjusters/nativeHTML.html +++ b/examples/framework/preferences/conditionalAdjusters/index.html @@ -49,7 +49,6 @@ - diff --git a/examples/framework/preferences/conditionalAdjusters/jQueryUI.html b/examples/framework/preferences/conditionalAdjusters/jQueryUI.html deleted file mode 100644 index 980cdcbeab..0000000000 --- a/examples/framework/preferences/conditionalAdjusters/jQueryUI.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - Preferences Editor Example: Conditional Adjusters - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - -
- - - - -
-
- - - - -
-

Test of Composite Panels With Conditional Show/Hide of Adjustors

-

This example illustrates two composite panels, each with a set of adjusters that are dependent on another boolean adjuster.

-

Initially*, you should see only a single on/off switch in each panel. Turning the preference on should reveal the dependent adjusters, and turning the preference off should hide them.

-

Any values set with the dependent adjusters should be preserved even if the controlling preference is turned off.

-

* Once the page is loaded, preference values are stored in a cookie, so on subsequent page loads the stored values will be used. To reset the example to its default state, clear cookies for the page.

-
- - diff --git a/examples/framework/preferences/conditionalAdjusters/js/auxiliarySchema.js b/examples/framework/preferences/conditionalAdjusters/js/auxiliarySchema.js index c2dc35b6d0..11f797fb35 100644 --- a/examples/framework/preferences/conditionalAdjusters/js/auxiliarySchema.js +++ b/examples/framework/preferences/conditionalAdjusters/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", @@ -77,7 +65,8 @@ var example = example || {}; panel: { type: "example.panels.vol", container: ".mpe-speaking-vol", - message: "%messagePrefix/speaking.json" + message: "%messagePrefix/speaking.json", + template: "%templatePrefix/slider-template.html" } }, wpm: { @@ -88,7 +77,8 @@ var example = example || {}; panel: { type: "example.panels.wpm", container: ".mpe-speaking-wpm", - message: "%messagePrefix/speaking.json" + message: "%messagePrefix/speaking.json", + template: "%templatePrefix/slider-template.html" } }, incSize: { @@ -111,7 +101,8 @@ var example = example || {}; panel: { type: "example.panels.cursor", container: ".mpe-increasing-cursor", - message: "%messagePrefix/increasing.json" + message: "%messagePrefix/increasing.json", + template: "%templatePrefix/slider-template.html" } }, magFactor: { @@ -122,7 +113,8 @@ var example = example || {}; panel: { type: "example.panels.magFactor", container: ".mpe-increasing-magFactor", - message: "%messagePrefix/increasing.json" + message: "%messagePrefix/increasing.json", + template: "%templatePrefix/slider-template.html" } }, magPos: { diff --git a/examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html b/examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html deleted file mode 100644 index f041390e9f..0000000000 --- a/examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - Preferences Editor - - - - - - - - - - diff --git a/examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html b/examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame.html similarity index 100% rename from examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html rename to examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame.html diff --git a/examples/framework/preferences/shared/html/slider-template-jQueryUI.html b/examples/framework/preferences/shared/html/slider-template-jQueryUI.html deleted file mode 100644 index 425c056fb4..0000000000 --- a/examples/framework/preferences/shared/html/slider-template-jQueryUI.html +++ /dev/null @@ -1,9 +0,0 @@ -
- -
-
-
-
-
-
-
diff --git a/examples/framework/preferences/shared/html/slider-template-nativeHTML.html b/examples/framework/preferences/shared/html/slider-template.html similarity index 100% rename from examples/framework/preferences/shared/html/slider-template-nativeHTML.html rename to examples/framework/preferences/shared/html/slider-template.html diff --git a/examples/framework/preferences/shared/js/contextAwareAuxSchemas.js b/examples/framework/preferences/shared/js/contextAwareAuxSchemas.js deleted file mode 100644 index 6e1d6b1991..0000000000 --- a/examples/framework/preferences/shared/js/contextAwareAuxSchemas.js +++ /dev/null @@ -1,75 +0,0 @@ -/* -Copyright 2016 OCAD University - -Licensed under the Educational Community License (ECL), Version 2.0 or the New -BSD license. You may not use this file except in compliance with one these -Licenses. - -You may obtain a copy of the ECL 2.0 License and BSD License at -https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt -*/ - -/* global fluid */ - -var example = example || {}; -(function ($, fluid) { - "use strict"; - - // Context-aware mixin for jQueryUI slider - fluid.defaults("example.auxSchema.jQueryUI", { - auxiliarySchema: { - vol: { - panel: { - template: "%templatePrefix/slider-template-jQueryUI.html" - } - }, - wpm: { - panel: { - template: "%templatePrefix/slider-template-jQueryUI.html" - } - }, - cursor: { - type: "example.cursorSize", - panel: { - template: "%templatePrefix/slider-template-jQueryUI.html" - } - }, - magFactor: { - type: "example.magnification", - panel: { - template: "%templatePrefix/slider-template-jQueryUI.html" - } - } - } - }); - - // Context-aware mixin for native slider - fluid.defaults("example.auxSchema.nativeHTML", { - auxiliarySchema: { - vol: { - panel: { - template: "%templatePrefix/slider-template-nativeHTML.html" - } - }, - wpm: { - panel: { - template: "%templatePrefix/slider-template-nativeHTML.html" - } - }, - cursor: { - type: "example.cursorSize", - panel: { - template: "%templatePrefix/slider-template-nativeHTML.html" - } - }, - magFactor: { - type: "example.magnification", - panel: { - template: "%templatePrefix/slider-template-nativeHTML.html" - } - } - } - }); - - -})(jQuery, fluid); diff --git a/src/framework/preferences/html/PrefsEditorTemplate-lineSpace-jQueryUI.html b/src/framework/preferences/html/PrefsEditorTemplate-lineSpace-jQueryUI.html deleted file mode 100644 index e6803ca38f..0000000000 --- a/src/framework/preferences/html/PrefsEditorTemplate-lineSpace-jQueryUI.html +++ /dev/null @@ -1,12 +0,0 @@ -
-

-

-
-
- -
- -
-
-
-
diff --git a/src/framework/preferences/html/PrefsEditorTemplate-lineSpace-nativeHTML.html b/src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html similarity index 100% rename from src/framework/preferences/html/PrefsEditorTemplate-lineSpace-nativeHTML.html rename to src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html diff --git a/src/framework/preferences/html/PrefsEditorTemplate-textSize-jQueryUI.html b/src/framework/preferences/html/PrefsEditorTemplate-textSize-jQueryUI.html deleted file mode 100644 index 25e3a0c216..0000000000 --- a/src/framework/preferences/html/PrefsEditorTemplate-textSize-jQueryUI.html +++ /dev/null @@ -1,15 +0,0 @@ -
-

- - -

-

-
-
- -
- -
-
-
-
diff --git a/src/framework/preferences/html/PrefsEditorTemplate-textSize-nativeHTML.html b/src/framework/preferences/html/PrefsEditorTemplate-textSize.html similarity index 100% rename from src/framework/preferences/html/PrefsEditorTemplate-textSize-nativeHTML.html rename to src/framework/preferences/html/PrefsEditorTemplate-textSize.html diff --git a/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html b/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html deleted file mode 100644 index 64c132ab34..0000000000 --- a/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - Preferences Editor - - - - - - - -
-
-
- - - diff --git a/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html b/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html similarity index 100% rename from src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html rename to src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html diff --git a/src/framework/preferences/js/SeparatedPanelPrefsEditor.js b/src/framework/preferences/js/SeparatedPanelPrefsEditor.js index 1c0e6b0799..31706078c8 100644 --- a/src/framework/preferences/js/SeparatedPanelPrefsEditor.js +++ b/src/framework/preferences/js/SeparatedPanelPrefsEditor.js @@ -54,16 +54,6 @@ var fluid_3_0_0 = fluid_3_0_0 || {}; gradeNames: "fluid.prefs.separatedPanel.lazyLoad" } } - }, - separatedPanelPrefsWidgetType: { - checks: { - jQueryUI: { - contextValue: "{fluid.prefsWidgetType}", - equals: "jQueryUI", - gradeNames: "fluid.prefs.separatedPanel.jQueryUI" - } - }, - defaultGradeNames: "fluid.prefs.separatedPanel.nativeHTML" } }, selectors: { @@ -202,7 +192,7 @@ var fluid_3_0_0 = fluid_3_0_0 || {}; iframeRenderer: { options: { markupProps: { - src: "%templatePrefix/SeparatedPanelPrefsEditorFrame-nativeHTML.html" + src: "%templatePrefix/SeparatedPanelPrefsEditorFrame.html" } } } @@ -242,7 +232,7 @@ var fluid_3_0_0 = fluid_3_0_0 || {}; }, markupProps: { "class": "flc-iframe", - src: "%templatePrefix/prefsEditorIframe.html" + src: "%templatePrefix/SeparatedPanelPrefsEditorFrame.html" }, listeners: { "onCreate.startLoadingIframe": "fluid.prefs.separatedPanel.renderIframe.startLoadingIframe" diff --git a/src/framework/preferences/js/StarterGrades.js b/src/framework/preferences/js/StarterGrades.js index a48e4e62e9..7ca49ae796 100644 --- a/src/framework/preferences/js/StarterGrades.js +++ b/src/framework/preferences/js/StarterGrades.js @@ -323,40 +323,16 @@ var fluid_3_0_0 = fluid_3_0_0 || {}; */ fluid.defaults("fluid.prefs.starterTemplateLoader", { - gradeNames: ["fluid.resourceLoader", "fluid.contextAware"], + gradeNames: ["fluid.resourceLoader"], resources: { + textSize: "%templatePrefix/PrefsEditorTemplate-textSize.html", + lineSpace: "%templatePrefix/PrefsEditorTemplate-lineSpace.html", textFont: "%templatePrefix/PrefsEditorTemplate-textFont.html", contrast: "%templatePrefix/PrefsEditorTemplate-contrast.html", layoutControls: "%templatePrefix/PrefsEditorTemplate-layout.html", linksControls: "%templatePrefix/PrefsEditorTemplate-linksControls.html", emphasizeLinks: "%templatePrefix/PrefsEditorTemplate-emphasizeLinks.html", inputsLarger: "%templatePrefix/PrefsEditorTemplate-inputsLarger.html" - }, - contextAwareness: { - startTemplateLoaderPrefsWidgetType: { - checks: { - jQueryUI: { - contextValue: "{fluid.prefsWidgetType}", - equals: "jQueryUI", - gradeNames: "fluid.prefs.starterTemplateLoader.jQuery" - } - }, - defaultGradeNames: "fluid.prefs.starterTemplateLoader.native" - } - } - }); - - fluid.defaults("fluid.prefs.starterTemplateLoader.native", { - resources: { - textSize: "%templatePrefix/PrefsEditorTemplate-textSize-nativeHTML.html", - lineSpace: "%templatePrefix/PrefsEditorTemplate-lineSpace-nativeHTML.html" - } - }); - - fluid.defaults("fluid.prefs.starterTemplateLoader.jQuery", { - resources: { - textSize: "%templatePrefix/PrefsEditorTemplate-textSize-jQueryUI.html", - lineSpace: "%templatePrefix/PrefsEditorTemplate-lineSpace-jQueryUI.html" } }); diff --git a/src/framework/preferences/js/StarterSchemas.js b/src/framework/preferences/js/StarterSchemas.js index ce39ab89b1..f0acbdace4 100644 --- a/src/framework/preferences/js/StarterSchemas.js +++ b/src/framework/preferences/js/StarterSchemas.js @@ -21,12 +21,17 @@ var fluid_3_0_0 = fluid_3_0_0 || {}; * contrast, table of contents, inputs larger and emphasize links *******************************************************************************/ - fluid.defaults("fluid.prefs.termsAware"); - - // textSize mixin (base) - fluid.defaults("fluid.prefs.auxSchema.starter.textSize", { - gradeNames: ["fluid.contextAware"], + fluid.defaults("fluid.prefs.auxSchema.starter", { + gradeNames: ["fluid.prefs.auxSchema"], auxiliarySchema: { + "loaderGrades": ["fluid.prefs.separatedPanel"], + "namespace": "fluid.prefs.constructed", // The author of the auxiliary schema will provide this and will be the component to call to initialize the constructed PrefsEditor. + "terms": { + "templatePrefix": "../../framework/preferences/html", // Must match the keyword used below to identify the common path to settings panel templates. + "messagePrefix": "../../framework/preferences/messages" // Must match the keyword used below to identify the common path to message files. + }, + "template": "%templatePrefix/SeparatedPanelPrefsEditor.html", + "message": "%messagePrefix/prefsEditor.json", "textSize": { "type": "fluid.prefs.textSize", "enactor": { @@ -35,114 +40,10 @@ var fluid_3_0_0 = fluid_3_0_0 || {}; "panel": { "type": "fluid.prefs.panel.textSize", "container": ".flc-prefsEditor-text-size", // the css selector in the template where the panel is rendered - "message": "%messagePrefix/textSize.json" - } - } - }, - contextAwareness: { - textSizeSliderVariety: { - checks: { - jQueryUI: { - contextValue: "{fluid.prefsWidgetType}", - equals: "jQueryUI", - gradeNames: "fluid.prefs.auxSchema.starter.textSize.jQueryUI" - } - }, - defaultGradeNames: "fluid.prefs.auxSchema.starter.textSize.nativeHTML" - } - } - }); - - fluid.defaults("fluid.prefs.auxSchema.starter.textSize.nativeHTML", { - auxiliarySchema: { - "textSize": { - "panel": { - "template": "%templatePrefix/PrefsEditorTemplate-textSize-nativeHTML.html" - } - } - } - }); - - fluid.defaults("fluid.prefs.auxSchema.starter.textSize.jQueryUI", { - auxiliarySchema: { - "textSize": { - "panel": { - "template": "%templatePrefix/PrefsEditorTemplate-textSize-jQueryUI.html" - } - } - } - }); - - // lineSpace mixin (base) - fluid.defaults("fluid.prefs.auxSchema.starter.lineSpace", { - gradeNames: ["fluid.contextAware"], - auxiliarySchema: { - "lineSpace": { - "type": "fluid.prefs.lineSpace", - "enactor": { - "type": "fluid.prefs.enactor.lineSpace", - "fontSizeMap": { - "xx-small": "9px", - "x-small": "11px", - "small": "13px", - "medium": "15px", - "large": "18px", - "x-large": "23px", - "xx-large": "30px" - } - }, - "panel": { - "type": "fluid.prefs.panel.lineSpace", - "container": ".flc-prefsEditor-line-space", // the css selector in the template where the panel is rendered - "message": "%messagePrefix/lineSpace.json" + "message": "%messagePrefix/textSize.json", + "template": "%templatePrefix/PrefsEditorTemplate-textSize.html" } - } - }, - contextAwareness: { - lineSpaceSliderVariety: { - checks: { - jQueryUI: { - contextValue: "{fluid.prefsWidgetType}", - equals: "jQueryUI", - gradeNames: "fluid.prefs.auxSchema.starter.lineSpace.jQueryUI" - } - }, - defaultGradeNames: "fluid.prefs.auxSchema.starter.lineSpace.nativeHTML" - } - } - }); - - fluid.defaults("fluid.prefs.auxSchema.starter.lineSpace.nativeHTML", { - auxiliarySchema: { - "lineSpace": { - "panel": { - "template": "%templatePrefix/PrefsEditorTemplate-lineSpace-nativeHTML.html" - } - } - } - }); - - fluid.defaults("fluid.prefs.auxSchema.starter.lineSpace.jQueryUI", { - auxiliarySchema: { - "lineSpace": { - "panel": { - "template": "%templatePrefix/PrefsEditorTemplate-lineSpace-jQueryUI.html" - } - } - } - }); - - fluid.defaults("fluid.prefs.auxSchema.starter", { - gradeNames: ["fluid.prefs.auxSchema", "fluid.prefs.auxSchema.starter.lineSpace", "fluid.prefs.auxSchema.starter.textSize"], - auxiliarySchema: { - "loaderGrades": ["fluid.prefs.separatedPanel"], - "namespace": "fluid.prefs.constructed", // The author of the auxiliary schema will provide this and will be the component to call to initialize the constructed PrefsEditor. - "terms": { - "templatePrefix": "../../framework/preferences/html", // Must match the keyword used below to identify the common path to settings panel templates. - "messagePrefix": "../../framework/preferences/messages" // Must match the keyword used below to identify the common path to message files. }, - "template": "%templatePrefix/SeparatedPanelPrefsEditor.html", - "message": "%messagePrefix/prefsEditor.json", "textFont": { "type": "fluid.prefs.textFont", "classes": { @@ -164,6 +65,27 @@ var fluid_3_0_0 = fluid_3_0_0 || {}; "message": "%messagePrefix/textFont.json" } }, + "lineSpace": { + "type": "fluid.prefs.lineSpace", + "enactor": { + "type": "fluid.prefs.enactor.lineSpace", + "fontSizeMap": { + "xx-small": "9px", + "x-small": "11px", + "small": "13px", + "medium": "15px", + "large": "18px", + "x-large": "23px", + "xx-large": "30px" + } + }, + "panel": { + "type": "fluid.prefs.panel.lineSpace", + "container": ".flc-prefsEditor-line-space", // the css selector in the template where the panel is rendered + "message": "%messagePrefix/lineSpace.json", + "template": "%templatePrefix/PrefsEditorTemplate-lineSpace.html" + } + }, "contrast": { "type": "fluid.prefs.contrast", "classes": { diff --git a/tests/component-tests/textToSpeech/js/TextToSpeechTests.js b/tests/component-tests/textToSpeech/js/TextToSpeechTests.js index 58569459e4..754d5c06c3 100644 --- a/tests/component-tests/textToSpeech/js/TextToSpeechTests.js +++ b/tests/component-tests/textToSpeech/js/TextToSpeechTests.js @@ -258,30 +258,10 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt fluid.test.conditionalTestUtils.bypassTest, "Browser appears to support TTS", "Browser does not appear to support TTS"); }; - fluid.defaults("fluid.tests.textToSpeech.contextAwareTestRunner", { - gradeNames: ["fluid.test.conditionalTestUtils.contextAwareTestRunner"], - contextAwareness: { - supportsPauseResume: { - checks: { - supportsPauseResume: { - contextValue: "{fluid.browser.platform.isLinux}", - equals: false, - gradeNames: ["fluid.tests.textToSpeech.supportsPauseResume"] - } - } - } - }, - tests: { - base: "fluid.tests.textToSpeech.baseTests" - } - }); - fluid.defaults("fluid.tests.textToSpeech.supportsPauseResume", { tests: { supportsPauseResume: "fluid.tests.textToSpeech.supportsPauseResumeTests" } }); - fluid.tests.textToSpeech.contextAwareTestRunner(); - })(); diff --git a/tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html b/tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html index 936d11531c..3707749304 100644 --- a/tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html +++ b/tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html @@ -20,7 +20,6 @@ - diff --git a/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html b/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html similarity index 100% rename from tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html rename to tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html diff --git a/tests/framework-tests/preferences/js/CompositePanelTestsGrades.js b/tests/framework-tests/preferences/js/CompositePanelTestsGrades.js index 0be8a76222..4b602ec587 100644 --- a/tests/framework-tests/preferences/js/CompositePanelTestsGrades.js +++ b/tests/framework-tests/preferences/js/CompositePanelTestsGrades.js @@ -162,7 +162,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt gradeNames: ["fluid.prefs.separatedPanel"], iframeRenderer: { markupProps: { - src: "./SeparatedPanelPrefsEditorFrame-nativeHTML.html" + src: "./SeparatedPanelPrefsEditorFrame.html" } } }); diff --git a/tests/framework-tests/preferences/js/PanelsTests.js b/tests/framework-tests/preferences/js/PanelsTests.js index ec84fcca43..a3ccf55ff6 100644 --- a/tests/framework-tests/preferences/js/PanelsTests.js +++ b/tests/framework-tests/preferences/js/PanelsTests.js @@ -1218,16 +1218,6 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt fluid.changeElementValue(textSlider.find("input"), newValue); }; - fluid.tests.switchWidgetType = function (widgetType, testPanel) { - fluid.contextAware.makeChecks({ - "fluid.prefsWidgetType": { - value: widgetType - } - }); - - testPanel.events.onSwitchedWidgetType.fire(); - }; - /******************************************************************************* * textSize *******************************************************************************/ @@ -1241,23 +1231,10 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt "textSizeLabel": "Text Size", "multiplier": "times", "textSizeDescr": "Adjust text size" - } - }); - - fluid.defaults("fluid.tests.prefs.panel.textSize.nativeHTML", { - gradeNames: ["fluid.tests.prefs.panel.textSize"], - resources: { - template: { - href: fluid.tests.prefsPaneltemplatePrefix + "PrefsEditorTemplate-textSize-nativeHTML.html" - } - } - }); - - fluid.defaults("fluid.tests.prefs.panel.textSize.jQueryUI", { - gradeNames: ["fluid.tests.prefs.panel.textSize"], + }, resources: { template: { - href: fluid.tests.prefsPaneltemplatePrefix + "PrefsEditorTemplate-textSize-jQueryUI.html" + href: fluid.tests.prefsPaneltemplatePrefix + "PrefsEditorTemplate-textSize.html" } } }); @@ -1268,53 +1245,13 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt components: { textSize: { type: "fluid.tests.prefs.panel.textSize", - createOnEvent: "{textSizePanel}.events.onSwitchedWidgetType" - }, - textSizeTester: { - type: "fluid.tests.textSizeTester" - } - }, - events: { - "onSwitchedWidgetType": null - } - }); - - // native HTML widget test - fluid.defaults("fluid.tests.textSizePanel.nativeHTML", { - gradeNames: ["fluid.tests.textSizePanel"], - components: { - textSize: { - type: "fluid.tests.prefs.panel.textSize.nativeHTML", container: ".flc-textSize" }, textSizeTester: { + type: "fluid.tests.textSizeTester", options: { - testOptions: { - widgetType: "nativeHTML" - }, - modules: [{ - name: "Test the text sizer settings panel (nativeHTML)" - }] - } - } - } - }); - - // jQueryUI widget test - fluid.defaults("fluid.tests.textSizePanel.jQueryUI", { - gradeNames: ["fluid.tests.textSizePanel"], - components: { - textSize: { - type: "fluid.tests.prefs.panel.textSize.jQueryUI", - container: ".flc-textSize-jQuery" - }, - textSizeTester: { - options: { - testOptions: { - widgetType: "jQueryUI" - }, modules: [{ - name: "Test the text sizer settings panel (jQueryUI)" + name: "Test the text sizer settings panel" }] } } @@ -1329,20 +1266,9 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt modules: [{ name: "Test the text sizer settings panel", tests: [{ - expect: 6, + expect: 3, name: "Test the rendering of the text size panel", sequence: [{ - func: "fluid.tests.switchWidgetType", - args: ["{that}.options.testOptions.widgetType", "{textSizePanel}"] - }, { - listener: "fluid.tests.testDefault", - event: "{textSizePanel textSize}.events.afterRender", - priority: "last", - args: ["{textSize}", { - label: "textSizeLabel", - textSizeDescr: "textSizeDescr" - }] - }, { func: "fluid.tests.changeInput", args: ["{textSize}.dom.textSize", "{that}.options.testOptions.newValue"] }, { @@ -1353,10 +1279,6 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt }, { func: "fluid.tests.testTextFieldSliderAriaLabelledBy", args: ["{textSize}"] - }, - { - func: "fluid.contextAware.forgetChecks", - args: ["fluid.prefsWidgetType"] }] }] }] @@ -1375,23 +1297,10 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt "lineSpaceLabel": "Line Spacing", "multiplier": "times", "lineSpaceDescr": "Adjust the spacing between lines of text" - } - }); - - fluid.defaults("fluid.tests.prefs.panel.lineSpace.nativeHTML", { - gradeNames: ["fluid.tests.prefs.panel.lineSpace"], - resources: { - template: { - href: fluid.tests.prefsPaneltemplatePrefix + "PrefsEditorTemplate-lineSpace-nativeHTML.html" - } - } - }); - - fluid.defaults("fluid.tests.prefs.panel.lineSpace.jQueryUI", { - gradeNames: ["fluid.tests.prefs.panel.lineSpace"], + }, resources: { template: { - href: fluid.tests.prefsPaneltemplatePrefix + "PrefsEditorTemplate-lineSpace-jQueryUI.html" + href: fluid.tests.prefsPaneltemplatePrefix + "PrefsEditorTemplate-lineSpace.html" } } }); @@ -1401,55 +1310,14 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt gradeNames: ["fluid.test.testEnvironment"], components: { lineSpace: { - createOnEvent: "{lineSpacePanel}.events.onSwitchedWidgetType" - }, - lineSpaceTester: { - type: "fluid.tests.lineSpaceTester" - } - }, - events: { - "onSwitchedWidgetType": null - } - }); - - // Native HTML test - fluid.defaults("fluid.tests.lineSpacePanel.nativeHTML", { - gradeNames: ["fluid.tests.lineSpacePanel"], - components: { - lineSpace: { - type: "fluid.tests.prefs.panel.lineSpace.nativeHTML", + type: "fluid.tests.prefs.panel.lineSpace", container: ".flc-lineSpace" }, lineSpaceTester: { type: "fluid.tests.lineSpaceTester", options: { - testOptions: { - widgetType: "nativeHTML" - }, - modules: [{ - name: "Test the line space settings panel (nativeHTML)" - }] - } - } - } - }); - - // jQuery UI test - fluid.defaults("fluid.tests.lineSpacePanel.jQueryUI", { - gradeNames: ["fluid.tests.lineSpacePanel"], - components: { - lineSpace: { - type: "fluid.tests.prefs.panel.lineSpace.jQueryUI", - container: ".flc-lineSpace-jQuery" - }, - lineSpaceTester: { - type: "fluid.tests.lineSpaceTester", - options: { - testOptions: { - widgetType: "jQueryUI" - }, modules: [{ - name: "Test the line space settings panel (jQueryUI)" + name: "Test the line space settings panel" }] } } @@ -1462,24 +1330,12 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt newValue: 1.2 }, modules: [{ - name: "Test the line space settings panel (native slider)", + name: "Test the line space settings panel", tests: [{ - expect: 6, + expect: 3, name: "Test the rendering of the line space panel", sequence: [ { - func: "fluid.tests.switchWidgetType", - args: ["{that}.options.testOptions.widgetType", "{lineSpacePanel}"] - }, - { - listener: "fluid.tests.testDefault", - event: "{lineSpacePanel lineSpace}.events.afterRender", - priority: "last", - args: ["{lineSpace}", { - label: "lineSpaceLabel", - lineSpaceDescr: "lineSpaceDescr" - }] - }, { func: "fluid.tests.changeInput", args: ["{lineSpace}.dom.lineSpace", "{that}.options.testOptions.newValue"] }, { @@ -1491,10 +1347,6 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt { func: "fluid.tests.testTextFieldSliderAriaLabelledBy", args: ["{lineSpace}"] - }, - { - func: "fluid.contextAware.forgetChecks", - args: ["fluid.prefsWidgetType"] } ] }] @@ -1505,18 +1357,11 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt // the textfieldSlider component, which needs to apply a single // label to both the slider and the textfield fluid.tests.testTextFieldSliderAriaLabelledBy = function (panel) { - - var currentWidgetType = fluid.contextAware.getCheckValue(fluid.rootComponent, "{fluid.prefsWidgetType}"); - var labelId = panel.locate("label").attr("id"); - - var sliderAriaLabelledby = currentWidgetType === "nativeHTML" ? panel.textfieldSlider.slider.container.attr("aria-labelledby") : - panel.textfieldSlider.slider.locate("thumb").attr("aria-labelledby"); - + var sliderAriaLabelledby = panel.textfieldSlider.slider.container.attr("aria-labelledby"); var textfieldAriaLabelledby = panel.textfieldSlider.textfield.container.attr("aria-labelledby"); jqUnit.assertEquals("textfieldSlider slider element has aria-labelledby attribute matching the panel label", labelId, sliderAriaLabelledby); - jqUnit.assertEquals("textfieldSlider textfield element has aria-labelledby attribute matching the panel label", labelId, textfieldAriaLabelledby); }; @@ -1824,10 +1669,8 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt fluid.test.runTests([ "fluid.tests.textFontPanel", "fluid.tests.contrastPanel", - "fluid.tests.textSizePanel.nativeHTML", - "fluid.tests.textSizePanel.jQueryUI", - "fluid.tests.lineSpacePanel.nativeHTML", - "fluid.tests.lineSpacePanel.jQueryUI", + "fluid.tests.textSizePanel", + "fluid.tests.lineSpacePanel", "fluid.tests.layoutPanel", "fluid.tests.emphasizeLinksPanel", "fluid.tests.inputsLargerPanel", diff --git a/tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js b/tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js index f28d18c742..edcb25e333 100644 --- a/tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js +++ b/tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js @@ -48,7 +48,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt }, iframeRenderer: { markupProps: { - src: "./SeparatedPanelPrefsEditorFrame-nativeHTML.html" + src: "./SeparatedPanelPrefsEditorFrame.html" } }, templateLoader: { @@ -221,7 +221,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt gradeNames: ["fluid.tests.prefs.mungingIntegrationBase"], iframeRenderer: { markupProps: { - src: "./SeparatedPanelPrefsEditorFrame-nativeHTML.html" + src: "./SeparatedPanelPrefsEditorFrame.html" } }, slidingPanel: { diff --git a/tests/framework-tests/preferences/js/URLUtilitiesTests.js b/tests/framework-tests/preferences/js/URLUtilitiesTests.js index 2ec2144255..c50d2182f6 100644 --- a/tests/framework-tests/preferences/js/URLUtilitiesTests.js +++ b/tests/framework-tests/preferences/js/URLUtilitiesTests.js @@ -28,37 +28,37 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt var tests = [ { - iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html", + iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html", outerLoc: "file:///E:/Source/gits/infusion-master/src/demos/prefsEditor/SeparatedPanelPrefsEditor/html/prefsEditor.html", relPath: "../../../../framework/preferences/html/", expected: "" }, { - iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html", + iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html", outerLoc: "file:///E:/Source/gits/infusion-master/src/demos/prefsEditor/SeparatedPanelPrefsEditor/html/prefsEditor.html", relPath: "../../../../framework/preferences/html/extra/", expected: "extra/" }, { - iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html", + iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html", outerLoc: "file:///E:/Source/gits/infusion-master/src/demos/prefsEditor/SeparatedPanelPrefsEditor/html/prefsEditor.html", relPath: "../../../../framework/preferences/html/extra/extra2/", expected: "extra/extra2/" }, { - iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html", + iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html", outerLoc: "file:///E:/Source/gits/infusion-master/src/demos/prefsEditor/SeparatedPanelPrefsEditor/html/prefsEditor.html", relPath: "a/b/g/", expected: "../../../demos/prefsEditor/SeparatedPanelPrefsEditor/html/a/b/g/" }, { - iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html", + iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html", outerLoc: "file:///E:/Source/gits/infusion-master/src/demos/prefsEditor/SeparatedPanelPrefsEditor/html/prefsEditor.html", relPath: "/a/b/g/", expected: "/a/b/g/" }, { - iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html", + iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html", outerLoc: "file:///E:/Source/gits/infusion-master/src/demos/prefsEditor/SeparatedPanelPrefsEditor/html/prefsEditor.html", relPath: "http://localhost:8888/wordpress/wp-content/themes/infusion/framework/preferences/html/", expected: "http://localhost:8888/wordpress/wp-content/themes/infusion/framework/preferences/html/" diff --git a/tests/manual-tests/framework/preferences/assortedContent/index-jQueryUI.html b/tests/manual-tests/framework/preferences/assortedContent/index-jQueryUI.html deleted file mode 100644 index d279d25df4..0000000000 --- a/tests/manual-tests/framework/preferences/assortedContent/index-jQueryUI.html +++ /dev/null @@ -1,297 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - Preferences Editor - Assorted Content - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - -
- - - - -
-
- - - - -
-
-

HTML 5 Cheat Sheet

-
- - -
-

HTML 5

-

- This is only a partial list of HTML5 elements. For a complete list please see the - HTML5 element list - on MDN - or the HTML5 document from the - W3C. -

-
This box tests some fancy CSS3 properties. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-
-

Grouping

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
HTML5 Grouping Elements
ElementExample
<p> -

Some text in a paragraph

-
<pre> -
-    Some pre-formatted
-    text
-
-
<blockquote> -
- A large quotation separated into its own block. -
-
<ol>, <li> -
    -
  1. Maple Leafs
    2. -
  2. Canadiens
    3. -
  3. Canucks
    4. -
  4. Senators
    5. -
  5. Flames
    6. -
  6. Oilers
    7. -
  7. Jets
    8. -
-
<dl>, <dt>, <dd> -
-
Fluid Infusion
-
- Developed by an international group of software developers and interaction designers, - Fluid Infusion combines JavaScript, CSS, HTML and user-centered design, rolling them - all into a single package that sits on top of the popular jQuery toolkit. Infusion - includes ready-to-use components as well as a framework to build your own. -
-
-
<figure>, <figcaption> -
- Fluid Infusion logo -
The Fluid Infusion logo
-
-
-

Text

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
HTML5 Text Elements
ElementExample
<a>Fluid Project
<em>Emphasized text
<strong>Strong text
<small>Small text
<code>var foo = "bar";
<sub>, <sup>H20, 22
-

Form

-
-

Mid-term Exam

-
- Choose the best way to declare a JavaScript variable -
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
-
-
- Select all values that are "truthy" - - - - - - - - - - -
-
- Array Values -

Considering the code sample to the right, answer the following questions:

- var aArray = ["a", "b", "c"]; -
- - -
-
- - -
-
-
- JavaScript function - - -
- -
-
-
-
- - - - - diff --git a/tests/manual-tests/framework/preferences/assortedContent/index-nativeHTML.html b/tests/manual-tests/framework/preferences/assortedContent/index.html similarity index 100% rename from tests/manual-tests/framework/preferences/assortedContent/index-nativeHTML.html rename to tests/manual-tests/framework/preferences/assortedContent/index.html diff --git a/tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js b/tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js index 83de29ecb5..703ff0c520 100644 --- a/tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js +++ b/tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js @@ -31,29 +31,18 @@ var assortedContent = assortedContent || {}; } }); - fluid.defaults("fluid.assortedContent.native", { - iframeRenderer: { - markupProps: { - src: "../../../../../src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html" - } - } - }); - - fluid.defaults("fluid.assortedContent.jQueryUI", { - iframeRenderer: { - markupProps: { - src: "../../../../../src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html" - } - } - }); - // Next, start up Preferences Editor fluid.prefs.separatedPanel(".flc-prefsEditor-separatedPanel", { - gradeNames: ["fluid.prefs.transformDefaultPanelsOptions", "fluid.prefs.initialModel.starter", "fluid.contextAware"], + gradeNames: ["fluid.prefs.transformDefaultPanelsOptions", "fluid.prefs.initialModel.starter"], terms: { templatePrefix: "../../../../../src/framework/preferences/html/", messagePrefix: "../../../../../src/framework/preferences/messages/" }, + iframeRenderer: { + markupProps: { + src: "../../../../../src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html" + } + }, messageLoader: { gradeNames: ["fluid.prefs.starterMessageLoader"] }, @@ -62,18 +51,6 @@ var assortedContent = assortedContent || {}; }, prefsEditor: { gradeNames: ["fluid.prefs.starterPanels", "fluid.prefs.uiEnhancerRelay"] - }, - contextAwareness: { - sliderVariety: { - checks: { - jQueryUI: { - contextValue: "{fluid.prefsWidgetType}", - equals: "jQueryUI", - gradeNames: "fluid.assortedContent.jQueryUI" - } - }, - defaultGradeNames: "fluid.assortedContent.native" - } } }); }; diff --git a/tests/manual-tests/framework/preferences/fullPage-schema/index-jQueryUI.html b/tests/manual-tests/framework/preferences/fullPage-schema/index-jQueryUI.html deleted file mode 100644 index 534e37e9dd..0000000000 --- a/tests/manual-tests/framework/preferences/fullPage-schema/index-jQueryUI.html +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - Preferences Editor: Full Page, With Preview, Using Schema - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
- -

Preferences Editor: Full Page using Schema

-
-
- - - diff --git a/tests/manual-tests/framework/preferences/fullPage-schema/index-nativeHTML.html b/tests/manual-tests/framework/preferences/fullPage-schema/index.html similarity index 100% rename from tests/manual-tests/framework/preferences/fullPage-schema/index-nativeHTML.html rename to tests/manual-tests/framework/preferences/fullPage-schema/index.html diff --git a/tests/manual-tests/framework/preferences/fullPage/index-jQueryUI.html b/tests/manual-tests/framework/preferences/fullPage/index-jQueryUI.html deleted file mode 100644 index 4ab679ee3a..0000000000 --- a/tests/manual-tests/framework/preferences/fullPage/index-jQueryUI.html +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - Preferences Editor: Full Page - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
- -

Preferences Editor: Full Page

-
-
- - - diff --git a/tests/manual-tests/framework/preferences/fullPage/index-nativeHTML.html b/tests/manual-tests/framework/preferences/fullPage/index.html similarity index 100% rename from tests/manual-tests/framework/preferences/fullPage/index-nativeHTML.html rename to tests/manual-tests/framework/preferences/fullPage/index.html