Repository: flex-asjs Updated Branches: refs/heads/release0.8.0 0d637b8d2 -> 5755a6e4b
Updates to Flat and DataBindingExample_Flat. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5755a6e4 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5755a6e4 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5755a6e4 Branch: refs/heads/release0.8.0 Commit: 5755a6e4b9a77dfc0744873045d7e557434d25af Parents: 0d637b8 Author: Peter Ent <p...@apache.org> Authored: Wed May 17 17:14:11 2017 -0400 Committer: Peter Ent <p...@apache.org> Committed: Wed May 17 17:14:11 2017 -0400 ---------------------------------------------------------------------- .../flexjs/DataBindingExample_Flat/build.xml | 1 + .../src/main/flex/MyInitialView.mxml | 6 +-- .../src/main/flex/controllers/MyController.as | 4 +- .../Flat/src/main/resources/defaults.css | 45 +++++++++++++++----- .../Flat/src/main/resources/flat-manifest.xml | 1 + 5 files changed, 42 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5755a6e4/examples/flexjs/DataBindingExample_Flat/build.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/DataBindingExample_Flat/build.xml b/examples/flexjs/DataBindingExample_Flat/build.xml index 2540061..7d82144 100644 --- a/examples/flexjs/DataBindingExample_Flat/build.xml +++ b/examples/flexjs/DataBindingExample_Flat/build.xml @@ -27,6 +27,7 @@ <property environment="env"/> <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> + <property name="opt1_arg" value="-js-output-optimization=skipAsCoercions" /> <include file="${basedir}/../../build_example.xml" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5755a6e4/examples/flexjs/DataBindingExample_Flat/src/main/flex/MyInitialView.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/DataBindingExample_Flat/src/main/flex/MyInitialView.mxml b/examples/flexjs/DataBindingExample_Flat/src/main/flex/MyInitialView.mxml index a639a18..5d67b2e 100644 --- a/examples/flexjs/DataBindingExample_Flat/src/main/flex/MyInitialView.mxml +++ b/examples/flexjs/DataBindingExample_Flat/src/main/flex/MyInitialView.mxml @@ -107,7 +107,7 @@ limitations under the License. <js:beads> <js:ViewDataBinding /> </js:beads> - <js:Container x="0" y="0" className="topContainer" > + <js:Container x="0" y="0" className="topContainer" width="400" > <js:beads> <js:VerticalLayout /> </js:beads> @@ -116,7 +116,7 @@ limitations under the License. <js:beads> <js:HorizontalLayout /> </js:beads> - <js:Container className="leftSide"> + <js:Container className="leftSide" width="200"> <js:beads> <js:VerticalLayout /> </js:beads> @@ -126,7 +126,7 @@ limitations under the License. <js:Label id="field" text="{fieldText}"/> <js:Label className="output" height="24" text="{MyModel(applicationModel).responseText}" /> </js:Container> - <js:Container className="rightSide"> + <js:Container className="rightSide" width="200"> <js:beads> <js:VerticalLayout /> </js:beads> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5755a6e4/examples/flexjs/DataBindingExample_Flat/src/main/flex/controllers/MyController.as ---------------------------------------------------------------------- diff --git a/examples/flexjs/DataBindingExample_Flat/src/main/flex/controllers/MyController.as b/examples/flexjs/DataBindingExample_Flat/src/main/flex/controllers/MyController.as index b7d52bd..6487908 100644 --- a/examples/flexjs/DataBindingExample_Flat/src/main/flex/controllers/MyController.as +++ b/examples/flexjs/DataBindingExample_Flat/src/main/flex/controllers/MyController.as @@ -42,8 +42,8 @@ package controllers private var service:HTTPService; private var collection:LazyCollection; - private var queryBegin:String = "http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20yahoo.finance.quotes%20where%20symbol%20in%20(%22"; - private var queryEnd:String = "%22)%0A%09%09&env=http%3A%2F%2Fdatatables.org%2Falltables.env&format=json"; + private var queryBegin:String = "https://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20yahoo.finance.quotes%20where%20symbol%20in%20(%22"; + private var queryEnd:String = "%22)%0A%09%09&env=store%3A%2F%2Fdatatables.org%2Falltableswithkeys&format=json"; private function viewChangeHandler(event:Event):void { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5755a6e4/frameworks/projects/Flat/src/main/resources/defaults.css ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/src/main/resources/defaults.css b/frameworks/projects/Flat/src/main/resources/defaults.css index 2e253f3..1c652d5 100644 --- a/frameworks/projects/Flat/src/main/resources/defaults.css +++ b/frameworks/projects/Flat/src/main/resources/defaults.css @@ -174,6 +174,8 @@ Container { IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView"); IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.BasicLayout"); + IViewport: ClassReference("org.apache.flex.html.supportClasses.Viewport"); + IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel"); } ControlBar @@ -187,6 +189,20 @@ ControlBar border-width: 1px; } +DataContainer +{ + IBeadModel: ClassReference("org.apache.flex.html.beads.models.DataProviderModel"); + IBeadView: ClassReference("org.apache.flex.html.beads.DataContainerView"); + IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalLayout"); + IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData"); + IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory"); + IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer"); + IViewport: ClassReference("org.apache.flex.html.supportClasses.Viewport"); + IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel"); + border-style: solid; + border-color: #222222; +} + /* ASJS */ DataGrid { @@ -498,7 +514,7 @@ ToolTip View { - IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView"); + IBeadView: ClassReference("org.apache.flex.html.beads.GroupView"); IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.BasicLayout"); } @@ -565,6 +581,7 @@ Container { iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead"); iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead"); + IContentView: ClassReference("org.apache.flex.html.supportClasses.ContainerContentArea"); } ControlBar @@ -575,21 +592,29 @@ ControlBar iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead"); } +DataContainer { + IBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead"); + IBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead"); + IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup"); +} + DropDownList { - IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel"); - IBeadView: ClassReference("org.apache.flex.flat.beads.DropDownListView"); - IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DropDownListController"); - IPopUp: ClassReference("org.apache.flex.flat.supportClasses.DropDownListList"); + IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel"); + IBeadView: ClassReference("org.apache.flex.html.beads.DropDownListView"); + IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DropDownListController"); + IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList"); } DropDownListList { - IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel"); - IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData"); - IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory"); - IItemRenderer: ClassReference("org.apache.flex.flat.supportClasses.DropDownListStringItemRenderer"); - iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead'); + IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel"); + IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData"); + IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory"); + IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer"); + iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead"); + iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead'); + iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel'); border-style: none; border-radius: 4px; border-color: #000000; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5755a6e4/frameworks/projects/Flat/src/main/resources/flat-manifest.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/src/main/resources/flat-manifest.xml b/frameworks/projects/Flat/src/main/resources/flat-manifest.xml index b10be42..246fadd 100644 --- a/frameworks/projects/Flat/src/main/resources/flat-manifest.xml +++ b/frameworks/projects/Flat/src/main/resources/flat-manifest.xml @@ -24,6 +24,7 @@ <component id="Button" class="org.apache.flex.html.Button" lookupOnly="true" /> <component id="ButtonBar" class="org.apache.flex.html.ButtonBar" lookupOnly="true" /> <component id="CloseButton" class="org.apache.flex.html.CloseButton" lookupOnly="true" /> + <component id="DataContainer" class="org.apache.flex.html.DataContainer" lookupOnly="true"/> <component id="DropDownList" class="org.apache.flex.flat.DropDownList" /> <component id="Image" class="org.apache.flex.html.Image" lookupOnly="true" /> <component id="Label" class="org.apache.flex.html.Label" lookupOnly="true" />
