Skip to content

Commit

Permalink
FLUID-5892: rename native/jQuery HTML templates to nativeHTML/jQueryU…
Browse files Browse the repository at this point in the history 
…I (more precise)
  • Loading branch information
@waharnum
waharnum committed May 17, 2016
1 parent d67eb35 commit 8eeb838
Show file tree
Hide file tree
Showing 17 changed files with 40 additions and 40 deletions.
8 changes: 4 additions & 4 deletions src/components/textfieldSlider/js/TextfieldSlider.js
View file
Expand Up @@ -44,13 +44,13 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
nativeHTML: {
contextValue: "{fluid.prefsWidgetType}",
equals: "nativeHTML",
gradeNames: "fluid.textfieldSliderNative"
gradeNames: "fluid.textfieldSlider.nativeHTML"

},
jQueryUI: {
contextValue: "{fluid.prefsWidgetType}",
equals: "jQueryUI",
gradeNames: "fluid.textfieldSliderJQuery"
gradeNames: "fluid.textfieldSlider.jQueryUI"
}
}
}
Expand Down Expand Up @@ -81,15 +81,15 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
}
});

fluid.defaults("fluid.textfieldSliderNative", {
fluid.defaults("fluid.textfieldSlider.nativeHTML", {
components: {
slider: {
type: "fluid.slider.native"
}
}
});

fluid.defaults("fluid.textfieldSliderJQuery", {
fluid.defaults("fluid.textfieldSlider.jQueryUI", {
components: {
slider: {
type: "fluid.slider.jQuery"
Expand Down
0 ...PrefsEditorTemplate-lineSpace-jQuery.html → ...efsEditorTemplate-lineSpace-jQueryUI.html
View file
File renamed without changes.
0 ...PrefsEditorTemplate-lineSpace-native.html → ...sEditorTemplate-lineSpace-nativeHTML.html
View file
File renamed without changes.
0 .../PrefsEditorTemplate-textSize-jQuery.html → ...refsEditorTemplate-textSize-jQueryUI.html
View file
File renamed without changes.
0 .../PrefsEditorTemplate-textSize-native.html → ...fsEditorTemplate-textSize-nativeHTML.html
View file
File renamed without changes.
0 ...eparatedPanelPrefsEditorFrame-jQuery.html → ...aratedPanelPrefsEditorFrame-jQueryUI.html
View file
File renamed without changes.
0 ...eparatedPanelPrefsEditorFrame-native.html → ...atedPanelPrefsEditorFrame-nativeHTML.html
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions src/framework/preferences/js/SeparatedPanelPrefsEditor.js
View file
Expand Up @@ -198,7 +198,7 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
iframeRenderer: {
options: {
markupProps: {
src: "%templatePrefix/SeparatedPanelPrefsEditorFrame-native.html"
src: "%templatePrefix/SeparatedPanelPrefsEditorFrame-nativeHTML.html"
}
}
}
Expand All @@ -211,7 +211,7 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
iframeRenderer: {
options: {
markupProps: {
src: "%templatePrefix/SeparatedPanelPrefsEditorFrame-jQuery.html"
src: "%templatePrefix/SeparatedPanelPrefsEditorFrame-jQueryUI.html"
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/framework/preferences/js/StarterGrades.js
View file
Expand Up @@ -353,15 +353,15 @@ var fluid_2_0_0 = fluid_2_0_0 || {};

fluid.defaults("fluid.prefs.starterTemplateLoader.native", {
resources: {
textSize: "%templatePrefix/PrefsEditorTemplate-textSize-native.html",
lineSpace: "%templatePrefix/PrefsEditorTemplate-lineSpace-native.html"
textSize: "%templatePrefix/PrefsEditorTemplate-textSize-nativeHTML.html",
lineSpace: "%templatePrefix/PrefsEditorTemplate-lineSpace-nativeHTML.html"
}
});

fluid.defaults("fluid.prefs.starterTemplateLoader.jQuery", {
resources: {
textSize: "%templatePrefix/PrefsEditorTemplate-textSize-jQuery.html",
lineSpace: "%templatePrefix/PrefsEditorTemplate-lineSpace-jQuery.html"
textSize: "%templatePrefix/PrefsEditorTemplate-textSize-jQueryUI.html",
lineSpace: "%templatePrefix/PrefsEditorTemplate-lineSpace-jQueryUI.html"
}
});

Expand Down
8 changes: 4 additions & 4 deletions src/framework/preferences/js/StarterSchemas.js
View file
Expand Up @@ -62,7 +62,7 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
auxiliarySchema: {
"textSize": {
"panel": {
"template": "%templatePrefix/PrefsEditorTemplate-textSize-native.html"
"template": "%templatePrefix/PrefsEditorTemplate-textSize-nativeHTML.html"
}
}
}
Expand All @@ -72,7 +72,7 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
auxiliarySchema: {
"textSize": {
"panel": {
"template": "%templatePrefix/PrefsEditorTemplate-textSize-jQuery.html"
"template": "%templatePrefix/PrefsEditorTemplate-textSize-jQueryUI.html"
}
}
}
Expand Down Expand Up @@ -126,7 +126,7 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
auxiliarySchema: {
"lineSpace": {
"panel": {
"template": "%templatePrefix/PrefsEditorTemplate-lineSpace-native.html"
"template": "%templatePrefix/PrefsEditorTemplate-lineSpace-nativeHTML.html"
}
}
}
Expand All @@ -136,7 +136,7 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
auxiliarySchema: {
"lineSpace": {
"panel": {
"template": "%templatePrefix/PrefsEditorTemplate-lineSpace-jQuery.html"
"template": "%templatePrefix/PrefsEditorTemplate-lineSpace-jQueryUI.html"
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions tests/framework-tests/preferences/js/AuxBuilderTests.js
View file
Expand Up @@ -487,7 +487,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
"panel": {
"type": "fluid.prefs.panel.textSize",
"container": ".flc-prefsEditor-text-size", // the css selector in the template where the panel is rendered
"template": "%templatePrefix/PrefsEditorTemplate-textSize-native.html",
"template": "%templatePrefix/PrefsEditorTemplate-textSize-nativeHTML.html",
"message": "%messagePrefix/PrefsEditorTemplate-textSize.json"
}
}
Expand Down Expand Up @@ -544,7 +544,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
"panel": {
"type": "fluid.prefs.panel.textSize",
"container": ".flc-prefsEditor-text-size", // the css selector in the template where the panel is rendered
"template": "%templatePrefix/PrefsEditorTemplate-textSize-native.html",
"template": "%templatePrefix/PrefsEditorTemplate-textSize-nativeHTML.html",
"message": "%messagePrefix/PrefsEditorTemplate-textSize.json"
}
},
Expand Down Expand Up @@ -657,7 +657,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
"panel": {
"type": "fluid.prefs.panel.textSize",
"container": ".flc-prefsEditor-text-size", // the css selector in the template where the panel is rendered
"template": "%templatePrefix/PrefsEditorTemplate-textSize-native.html",
"template": "%templatePrefix/PrefsEditorTemplate-textSize-nativeHTML.html",
"message": "%messagePrefix/PrefsEditorTemplate-textSize.json"
}
},
Expand Down Expand Up @@ -691,7 +691,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
templateLoader: {
gradeNames: ["fluid.prefs.resourceLoader"],
resources: {
"fluid_prefs_panel_textSize": "%templatePrefix/PrefsEditorTemplate-textSize-native.html"
"fluid_prefs_panel_textSize": "%templatePrefix/PrefsEditorTemplate-textSize-nativeHTML.html"
}
},
messageLoader: {
Expand Down Expand Up @@ -794,7 +794,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
"panel": {
"type": "fluid.prefs.panel.textSize",
"container": ".flc-prefsEditor-text-size", // the css selector in the template where the panel is rendered
"template": "%templatePrefix/PrefsEditorTemplate-textSize-native.html",
"template": "%templatePrefix/PrefsEditorTemplate-textSize-nativeHTML.html",
"message": "%messagePrefix/PrefsEditorTemplate-textSize.json"
}
},
Expand Down Expand Up @@ -857,7 +857,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
templateLoader: {
gradeNames: ["fluid.prefs.resourceLoader"],
resources: {
"fluid_prefs_panel_textSize": "%templatePrefix/PrefsEditorTemplate-textSize-native.html",
"fluid_prefs_panel_textSize": "%templatePrefix/PrefsEditorTemplate-textSize-nativeHTML.html",
"fluid_prefs_panel_otherTextSize": "%templatePrefix/PrefsEditorTemplate-otherTextSize.html"
}
},
Expand Down Expand Up @@ -967,7 +967,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
"panel": {
"type": "fluid.prefs.panel.textSize",
"container": ".flc-prefsEditor-text-size", // the css selector in the template where the panel is rendered
"template": "%templatePrefix/PrefsEditorTemplate-textSize-native.html",
"template": "%templatePrefix/PrefsEditorTemplate-textSize-nativeHTML.html",
"message": "%messagePrefix/PrefsEditorTemplate-textSize.json"
},
"enactor": {
Expand Down Expand Up @@ -1005,7 +1005,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
gradeNames: ["fluid.prefs.resourceLoader"],
resources: {
"prefsEditor": "%templatePrefix/SeparatedPanelPrefsEditor.html",
"fluid_prefs_panel_textSize": "%templatePrefix/PrefsEditorTemplate-textSize-native.html"
"fluid_prefs_panel_textSize": "%templatePrefix/PrefsEditorTemplate-textSize-nativeHTML.html"
}
},
messageLoader: {
Expand Down
4 changes: 2 additions & 2 deletions tests/framework-tests/preferences/js/BuilderTests.js
View file
Expand Up @@ -80,7 +80,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
"panel": {
"type": "fluid.prefs.panel.textSize",
"container": ".flc-prefsEditor-text-size", // the css selector in the template where the panel is rendered
"template": "%templatePrefix/PrefsEditorTemplate-textSize-native.html",
"template": "%templatePrefix/PrefsEditorTemplate-textSize-nativeHTML.html",
"message": "%messagePrefix/textSize.json"
}
},
Expand All @@ -101,7 +101,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
"panel": {
"type": "fluid.prefs.panel.lineSpace",
"container": ".flc-prefsEditor-line-space", // the css selector in the template where the panel is rendered
"template": "%templatePrefix/PrefsEditorTemplate-lineSpace-native.html",
"template": "%templatePrefix/PrefsEditorTemplate-lineSpace-nativeHTML.html",
"message": "%messagePrefix/lineSpace.json"
}
}
Expand Down
8 changes: 4 additions & 4 deletions tests/framework-tests/preferences/js/PanelsTests.js
View file
Expand Up @@ -1256,7 +1256,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
},
resources: {
template: {
href: fluid.tests.prefsPaneltemplatePrefix + "PrefsEditorTemplate-textSize-native.html"
href: fluid.tests.prefsPaneltemplatePrefix + "PrefsEditorTemplate-textSize-nativeHTML.html"
}
}
});
Expand All @@ -1265,7 +1265,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
gradeNames: ["fluid.tests.prefs.panel.textSize"],
resources: {
template: {
href: fluid.tests.prefsPaneltemplatePrefix + "PrefsEditorTemplate-textSize-jQuery.html"
href: fluid.tests.prefsPaneltemplatePrefix + "PrefsEditorTemplate-textSize-jQueryUI.html"
}
}
});
Expand Down Expand Up @@ -1391,7 +1391,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
},
resources: {
template: {
href: fluid.tests.prefsPaneltemplatePrefix + "PrefsEditorTemplate-lineSpace-native.html"
href: fluid.tests.prefsPaneltemplatePrefix + "PrefsEditorTemplate-lineSpace-nativeHTML.html"
}
}
});
Expand All @@ -1400,7 +1400,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
gradeNames: ["fluid.tests.prefs.panel.lineSpace"],
resources: {
template: {
href: fluid.tests.prefsPaneltemplatePrefix + "PrefsEditorTemplate-lineSpace-jQuery.html"
href: fluid.tests.prefsPaneltemplatePrefix + "PrefsEditorTemplate-lineSpace-jQueryUI.html"
}
}
});
Expand Down
4 changes: 2 additions & 2 deletions tests/framework-tests/preferences/js/PrefsEditorTests.js
View file
Expand Up @@ -25,7 +25,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt

fluid.tests.prefs.resourceLoader.linksControlsTemplateName = "PrefsEditorTemplate-linksControls.html";
fluid.tests.prefs.resourceLoader.testTemplatePrefix = "../../../../src/framework/preferences/html";
fluid.tests.prefs.resourceLoader.textControlsFullPath = "../../../../src/framework/preferences/html/PrefsEditorTemplate-textSize-native.html";
fluid.tests.prefs.resourceLoader.textControlsFullPath = "../../../../src/framework/preferences/html/PrefsEditorTemplate-textSize-nativeHTML.html";

fluid.defaults("fluid.tests.prefs.resourceLoader", {
gradeNames: ["fluid.prefs.resourceLoader"],
Expand Down Expand Up @@ -58,7 +58,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
fluid.tests.prefs.resourceLoader();
});

fluid.tests.prefs.resourceLoader.lineSpaceTemplateName = "PrefsEditorTemplate-lineSpace-native.html";
fluid.tests.prefs.resourceLoader.lineSpaceTemplateName = "PrefsEditorTemplate-lineSpace-nativeHTML.html";

fluid.tests.prefs.resourceLoader.testCustomizedResourceLoader = function (resources) {
jqUnit.assertEquals("lineSpace template url is set correctly", fluid.tests.prefs.resourceLoader.testTemplatePrefix + "/" + fluid.tests.prefs.resourceLoader.lineSpaceTemplateName, resources.lineSpace.url);
Expand Down
4 changes: 2 additions & 2 deletions tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
View file
Expand Up @@ -47,7 +47,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
},
iframeRenderer: {
markupProps: {
src: "./SeparatedPanelPrefsEditorFrame-native.html"
src: "./SeparatedPanelPrefsEditorFrame-nativeHTML.html"
}
},
templateLoader: {
Expand Down Expand Up @@ -219,7 +219,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
options: fluid.merge(null, fluid.tests.prefs.mungingIntegrationOptions, { // TODO: Why on earth does this not use standard grade merging?
iframeRenderer: {
markupProps: {
src: "./SeparatedPanelPrefsEditorFrame-native.html"
src: "./SeparatedPanelPrefsEditorFrame-nativeHTML.html"
}
},
slidingPanel: {
Expand Down
12 changes: 6 additions & 6 deletions tests/framework-tests/preferences/js/URLUtilitiesTests.js
View file
Expand Up @@ -27,37 +27,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-native.html",
iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.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-native.html",
iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.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-native.html",
iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.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-native.html",
iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.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-native.html",
iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.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-native.html",
iframeLoc: "file:///E:/Source/gits/infusion-master/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.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/"
Expand Down
4 changes: 2 additions & 2 deletions tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js
View file
Expand Up @@ -34,15 +34,15 @@ var assortedContent = assortedContent || {};
fluid.defaults("fluid.assortedContent.native", {
iframeRenderer: {
markupProps: {
src: "../../../../../src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-native.html"
src: "../../../../../src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html"
}
}
});

fluid.defaults("fluid.assortedContent.jQueryUI", {
iframeRenderer: {
markupProps: {
src: "../../../../../src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-jQuery.html"
src: "../../../../../src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html"
}
}
});
Expand Down

0 comments on commit 8eeb838

Please sign in to comment.