Skip to content

Commit

Permalink
Merge remote-tracking branch 'cindyli/FLUID-4976'
Browse files Browse the repository at this point in the history 
* cindyli/FLUID-4976:
  FLUID-4976: Rename the filename or events that has "enactors" to "enactor".
  FLUID-4976: Renamed the base enactor grade from "enactors" to "enactor".
  • Loading branch information
@michelled
michelled committed Apr 19, 2013
2 parents bf6163f + 06a5f62 commit 1f2bbbe
Show file tree
Hide file tree
Showing 17 changed files with 27 additions and 27 deletions.
14 changes: 7 additions & 7 deletions ...ebapp/components/uiOptions/js/Enactors.js → ...webapp/components/uiOptions/js/Enactor.js
View file
Expand Up @@ -19,7 +19,7 @@ var fluid_1_5 = fluid_1_5 || {};

(function ($, fluid) {

fluid.defaults("fluid.uiOptions.enactors", {
fluid.defaults("fluid.uiOptions.enactor", {
gradeNames: ["fluid.modelComponent", "fluid.eventedComponent", "fluid.uiOptions.modelRelay", "autoInit"]
});

Expand All @@ -30,7 +30,7 @@ var fluid_1_5 = fluid_1_5 || {};
* This component is used as a grade by emphasizeLinks & inputsLarger
**********************************************************************************/
fluid.defaults("fluid.uiOptions.enactor.styleElements", {
gradeNames: ["fluid.uiOptions.enactors", "autoInit"],
gradeNames: ["fluid.uiOptions.enactor", "autoInit"],
cssClass: null, // Must be supplied by implementors
model: {
value: false
Expand Down Expand Up @@ -142,7 +142,7 @@ var fluid_1_5 = fluid_1_5 || {};

// Note that the implementors need to provide the container for this view component
fluid.defaults("fluid.uiOptions.enactor.classSwapper", {
gradeNames: ["fluid.viewComponent", "fluid.uiOptions.enactors", "autoInit"],
gradeNames: ["fluid.viewComponent", "fluid.uiOptions.enactor", "autoInit"],
classes: {}, // Must be supplied by implementors
model: {
value: ""
Expand Down Expand Up @@ -227,7 +227,7 @@ var fluid_1_5 = fluid_1_5 || {};

// Note that the implementors need to provide the container for this view component
fluid.defaults("fluid.uiOptions.enactor.textSizer", {
gradeNames: ["fluid.viewComponent", "fluid.uiOptions.enactors", "autoInit"],
gradeNames: ["fluid.viewComponent", "fluid.uiOptions.enactor", "autoInit"],
fontSizeMap: {}, // must be supplied by implementors
model: {
value: 1
Expand Down Expand Up @@ -308,7 +308,7 @@ var fluid_1_5 = fluid_1_5 || {};

// Note that the implementors need to provide the container for this view component
fluid.defaults("fluid.uiOptions.enactor.lineSpacer", {
gradeNames: ["fluid.viewComponent", "fluid.uiOptions.enactors", "autoInit"],
gradeNames: ["fluid.viewComponent", "fluid.uiOptions.enactor", "autoInit"],
fontSizeMap: {}, // must be supplied by implementors
model: {
value: 1
Expand Down Expand Up @@ -407,7 +407,7 @@ var fluid_1_5 = fluid_1_5 || {};

// Note that the implementors need to provide the container for this view component
fluid.defaults("fluid.uiOptions.enactor.tableOfContentsEnactor", {
gradeNames: ["fluid.viewComponent", "fluid.uiOptions.enactors", "autoInit"],
gradeNames: ["fluid.viewComponent", "fluid.uiOptions.enactor", "autoInit"],
tocTemplate: null, // must be supplied by implementors
model: {
value: false
Expand Down Expand Up @@ -532,7 +532,7 @@ var fluid_1_5 = fluid_1_5 || {};

// Note that the implementors need to provide the container for this view component
fluid.defaults("fluid.uiOptions.enactor.IE6ColorInversion", {
gradeNames: ["fluid.viewComponent", "fluid.uiOptions.enactors", "autoInit"],
gradeNames: ["fluid.viewComponent", "fluid.uiOptions.enactor", "autoInit"],
selectors: {
colorInversion: ".fl-inverted-color"
},
Expand Down
8 changes: 4 additions & 4 deletions src/webapp/components/uiOptions/js/UIEnhancer.js
View file
Expand Up @@ -98,7 +98,7 @@ var fluid_1_5 = fluid_1_5 || {};
}
},
events: {
onAsyncEnactorsReady: null
onAsyncEnactorReady: null
}
});

Expand Down Expand Up @@ -201,8 +201,8 @@ var fluid_1_5 = fluid_1_5 || {};
"toc": "value"
},
listeners: {
afterTocRender: "{uiEnhancer}.events.onAsyncEnactorsReady",
onLateRefreshRelay: "{uiEnhancer}.events.onAsyncEnactorsReady"
afterTocRender: "{uiEnhancer}.events.onAsyncEnactorReady",
onLateRefreshRelay: "{uiEnhancer}.events.onAsyncEnactorReady"
}
}
},
Expand All @@ -221,7 +221,7 @@ var fluid_1_5 = fluid_1_5 || {};
onCreateToc: null
},
listeners: {
onAsyncEnactorsReady: [{
onAsyncEnactorReady: [{
listener: "{that}.emphasizeLinks.handleStyle",
args: "{that}.model.links"
}, {
Expand Down
2 changes: 1 addition & 1 deletion src/webapp/components/uiOptions/uiOptionsDependencies.json
View file
Expand Up @@ -12,7 +12,7 @@
"files": [
"URLUtilities.js",
"Store.js",
"Enactors.js",
"Enactor.js",
"ModelRelay.js",
"UIEnhancer.js",
"UIOptions.js",
Expand Down
2 changes: 1 addition & 1 deletion src/webapp/demos/uiOptions/html/uiOptions.html
View file
Expand Up @@ -50,7 +50,7 @@
<script type="text/javascript" src="../../../components/uiOptions/js/Store.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/UIOptions.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/ModelRelay.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/Enactors.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/Enactor.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/UIEnhancer.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/FatPanelUIOptions.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/SlidingPanel.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
View file
Expand Up @@ -46,7 +46,7 @@

<script type="text/javascript" src="../../../components/uiOptions/js/Store.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/ModelRelay.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/Enactors.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/Enactor.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/UIEnhancer.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/UIOptions.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/FullPreviewUIOptions.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
View file
Expand Up @@ -46,7 +46,7 @@

<script type="text/javascript" src="../../../components/uiOptions/js/Store.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/ModelRelay.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/Enactors.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/Enactor.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/UIEnhancer.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/UIOptions.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/FullNoPreviewUIOptions.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
View file
Expand Up @@ -56,7 +56,7 @@
<script type="text/javascript" src="../../../components/uiOptions/js/URLUtilities.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/Store.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/ModelRelay.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/Enactors.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/Enactor.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/UIEnhancer.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/UIOptions.js"></script>
<script type="text/javascript" src="../../../components/tableOfContents/js/TableOfContents.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/webapp/integration-demos/uportal/html/portal.html
View file
Expand Up @@ -46,7 +46,7 @@
<script type="text/javascript" src="../../../components/uiOptions/js/Store.js"></script>
<script type="text/javascript" src="../../../components/tableOfContents/js/TableOfContents.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/ModelRelay.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/Enactors.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/Enactor.js"></script>
<script type="text/javascript" src="../../../components/uiOptions/js/UIEnhancer.js"></script>

<!-- Javascript file containing initialization scripts for the Fluid components in this example -->
Expand Down
6 changes: 3 additions & 3 deletions ...t-tests/uiOptions/html/Enactors-test.html → ...nt-tests/uiOptions/html/Enactor-test.html
View file
Expand Up @@ -21,20 +21,20 @@
<script type="text/javascript" src="../../../../framework/core/js/FluidIoC.js"></script>
<script type="text/javascript" src="../../../../components/tableOfContents/js/TableOfContents.js"></script>

<script type="text/javascript" src="../../../../components/uiOptions/js/Enactors.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/Enactor.js"></script>

<!-- These are the jqUnit test js files -->
<script type="text/javascript" src="../../../lib/qunit/js/qunit.js"></script>
<script type="text/javascript" src="../../../test-core/jqUnit/js/jqUnit.js"></script>
<script type="text/javascript" src="../../../test-core/utils/js/IoCTestUtils.js"></script>

<!-- These are tests that have been written using this page as data -->
<script type="text/javascript" src="../js/EnactorsTests.js"></script>
<script type="text/javascript" src="../js/EnactorTests.js"></script>

</head>

<body class="fl-layout-linear">
<h1 id="qunit-header">Enactors Test Suite</h1>
<h1 id="qunit-header">Enactor Test Suite</h1>
<h2 id="qunit-banner"></h2>
<div id="qunit-testrunner-toolbar"></div>
<h2 id="qunit-userAgent"></h2>
Expand Down
2 changes: 1 addition & 1 deletion src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
View file
Expand Up @@ -29,7 +29,7 @@
<script type="text/javascript" src="../../../../components/uiOptions/js/URLUtilities.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/Store.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/ModelRelay.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/Enactors.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/Enactor.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/UIEnhancer.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/UIOptions.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/FatPanelUIOptions.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
View file
Expand Up @@ -30,7 +30,7 @@

<script type="text/javascript" src="../../../../components/uiOptions/js/Store.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/ModelRelay.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/Enactors.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/Enactor.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/UIEnhancer.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/UIOptions.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/FullNoPreviewUIOptions.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
View file
Expand Up @@ -30,7 +30,7 @@

<script type="text/javascript" src="../../../../components/uiOptions/js/Store.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/ModelRelay.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/Enactors.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/Enactor.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/UIEnhancer.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/UIOptions.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/FullPreviewUIOptions.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/webapp/tests/component-tests/uiOptions/html/PageEnhancer-test.html
View file
Expand Up @@ -23,7 +23,7 @@

<script type="text/javascript" src="../../../../components/uiOptions/js/Store.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/ModelRelay.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/Enactors.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/Enactor.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/UIEnhancer.js"></script>
<script type="text/javascript" src="../../../../components/tableOfContents/js/TableOfContents.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
View file
Expand Up @@ -23,7 +23,7 @@

<script type="text/javascript" src="../../../../components/uiOptions/js/Store.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/ModelRelay.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/Enactors.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/Enactor.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/UIEnhancer.js"></script>
<script type="text/javascript" src="../../../../components/tableOfContents/js/TableOfContents.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
View file
Expand Up @@ -24,7 +24,7 @@
<script type="text/javascript" src="../../../../framework/renderer/js/RendererUtilities.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/Store.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/ModelRelay.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/Enactors.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/Enactor.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/UIEnhancer.js"></script>
<script type="text/javascript" src="../../../../components/uiOptions/js/UIOptions.js"></script>

Expand Down
0 ...onent-tests/uiOptions/js/EnactorsTests.js → ...ponent-tests/uiOptions/js/EnactorTests.js
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
View file
Expand Up @@ -169,7 +169,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
}, {
listener: "fluid.tests.testTocStyling",
spec: {priority: "last"},
event: "{uiEnhancer}.events.onAsyncEnactorsReady"
event: "{uiEnhancer}.events.onAsyncEnactorReady"
}, {
func: "fluid.tests.testSettings",
args: ["{uiEnhancer}", "{that}.options.testOpts.testSettings", "{that}.options.testOpts.initialFontSize"]
Expand Down

0 comments on commit 1f2bbbe

Please sign in to comment.