You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ha...@apache.org on 2017/07/03 13:32:58 UTC
[01/29] git commit: [flex-asjs] [refs/heads/tlf] - Merge branch
'release0.8.0' into feature/FLEX-35328_simplify_mdl_drop_down_list
Repository: flex-asjs
Updated Branches:
refs/heads/tlf b32119f66 -> b1d89fada
Merge branch 'release0.8.0' into feature/FLEX-35328_simplify_mdl_drop_down_list
# Conflicts:
# archetypes/flexjs-simple-application-archetype/pom.xml
# archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
# archetypes/flexjs-simple-application-pure-js-archetype/pom.xml
# archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml
# archetypes/flexjs-simple-application-pure-swf-archetype/pom.xml
# archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml
# archetypes/flexjs-simple-library-archetype/pom.xml
# archetypes/flexjs-simple-library-archetype/src/main/resources/archetype-resources/pom.xml
# archetypes/flexjs-simple-typedef-archetype/pom.xml
# archetypes/flexjs-simple-typedef-archetype/src/main/resources/archetype-resources/pom.xml
# archetypes/pom.xml
# distribution/jars/compc/pom.xml
# distribution/jars/falcon-asc/pom.xml
# distribution/jars/falcon-compc/pom.xml
# distribution/jars/falcon-mxmlc/pom.xml
# distribution/jars/falcon-optimizer/pom.xml
# distribution/jars/falcon-swfdump/pom.xml
# distribution/jars/mxmlc/pom.xml
# distribution/pom.xml
# distribution/src/main/assembly/component.xml
# examples/examples-integrationtests/pom.xml
# examples/examples-tests/pom.xml
# examples/express/DataBindingExample/pom.xml
# examples/express/pom.xml
# examples/flexjs/ASDoc/pom.xml
# examples/flexjs/ChartExample/pom.xml
# examples/flexjs/CordovaCameraExample/pom.xml
# examples/flexjs/CreateJSExample/pom.xml
# examples/flexjs/DataBindingExample/pom.xml
# examples/flexjs/DataBindingExampleWithFlexLayout/pom.xml
# examples/flexjs/DataBindingExample_Flat/pom.xml
# examples/flexjs/DataBindingExample_as/pom.xml
# examples/flexjs/DataGridExample/pom.xml
# examples/flexjs/DateControlsExample/pom.xml
# examples/flexjs/DesktopMap/pom.xml
# examples/flexjs/FlexJSStore/pom.xml
# examples/flexjs/FlexJSStore_jquery/pom.xml
# examples/flexjs/FlexTeamPage_MDL/pom.xml
# examples/flexjs/FlexWebsiteStatsViewer/pom.xml
# examples/flexjs/HelloWorld/pom.xml
# examples/flexjs/ListExample/pom.xml
# examples/flexjs/MDLBlogExample/pom.xml
# examples/flexjs/MDLDynamicTabsExample/pom.xml
# examples/flexjs/MDLExample/pom.xml
# examples/flexjs/MapSearch/pom.xml
# examples/flexjs/MobileMap/pom.xml
# examples/flexjs/MobileStocks/pom.xml
# examples/flexjs/MobileTrader/pom.xml
# examples/flexjs/StorageExample/pom.xml
# examples/flexjs/StyleExample/pom.xml
# examples/flexjs/TableExample/pom.xml
# examples/flexjs/TeamPage/pom.xml
# examples/flexjs/TodoListSampleApp/pom.xml
# examples/flexjs/TreeExample/pom.xml
# examples/flexjs/pom.xml
# examples/native/AngularExample/pom.xml
# examples/native/ButtonExample/pom.xml
# examples/native/USStatesMap/pom.xml
# examples/native/pom.xml
# examples/pom.xml
# frameworks/fontsrc/pom.xml
# frameworks/pom.xml
# frameworks/projects/Basic/pom.xml
# frameworks/projects/Binding/pom.xml
# frameworks/projects/Charts/pom.xml
# frameworks/projects/Collections/pom.xml
# frameworks/projects/Core/pom.xml
# frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
# frameworks/projects/CreateJS/pom.xml
# frameworks/projects/DragDrop/pom.xml
# frameworks/projects/Effects/pom.xml
# frameworks/projects/Express/pom.xml
# frameworks/projects/Flat/pom.xml
# frameworks/projects/FontAwesome/pom.xml
# frameworks/projects/Formatters/pom.xml
# frameworks/projects/GoogleMaps/pom.xml
# frameworks/projects/Graphics/pom.xml
# frameworks/projects/HTML/pom.xml
# frameworks/projects/HTML5/pom.xml
# frameworks/projects/JQuery/pom.xml
# frameworks/projects/Language/pom.xml
# frameworks/projects/MaterialDesignLite/pom.xml
# frameworks/projects/Mobile/pom.xml
# frameworks/projects/Network/pom.xml
# frameworks/projects/Reflection/pom.xml
# frameworks/projects/Storage/pom.xml
# frameworks/projects/XML/pom.xml
# frameworks/projects/pom.xml
# pom.xml
# testsuite/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fd98bf0c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fd98bf0c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fd98bf0c
Branch: refs/heads/tlf
Commit: fd98bf0c859b902ca58833a139bcef11c3fe8760
Parents: 2a02f94 1656e37
Author: piotrz <pi...@apache.org>
Authored: Wed Jun 21 23:11:35 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Wed Jun 21 23:11:35 2017 +0200
----------------------------------------------------------------------
ApproveFlexJS.xml | 77 +-
RELEASE_NOTES | 20 +-
.../main/resources/archetype-resources/pom.xml | 1 +
.../pom.xml | 6 +-
build.xml | 43 +-
cordova-build.xml | 8 +-
distribution/pom.xml | 4 +-
distribution/src/main/assembly/component.xml | 15 +
.../frameworks/air-config-template.xml | 850 +++++++++---------
.../main/resources/frameworks/air-config.xml | 851 ++++++++++---------
.../resources/frameworks/airmobile-config.xml | 568 ++++++++++---
.../frameworks/createjs-config-template.xml | 13 +-
.../resources/frameworks/createjs-config.xml | 21 +-
.../frameworks/flex-config-template.xml | 748 ++++++++--------
.../main/resources/frameworks/flex-config.xml | 736 +++++++++-------
.../frameworks/jquery-config-template.xml | 14 +-
.../main/resources/frameworks/jquery-config.xml | 22 +-
.../resources/frameworks/js-config-template.xml | 11 +-
.../src/main/resources/frameworks/js-config.xml | 19 +-
.../frameworks/node-config-template.xml | 543 ++++++------
.../main/resources/frameworks/node-config.xml | 543 ++++++------
examples/build.xml | 40 +-
examples/build_example.xml | 167 +++-
examples/express/DataBindingExample/build.xml | 10 +
examples/express/DataBindingExample/pom.xml | 2 +
.../src/main/flex/DataBindingExample.mxml | 11 +-
.../src/main/flex/controllers/MyController.as | 6 +-
examples/express/pom.xml | 16 +
examples/flexjs/ASDoc/build.xml | 18 +-
examples/flexjs/ASDoc/pom.xml | 1 +
.../ASDoc/src/main/flex/ASDocMainView.mxml | 83 +-
.../ASDoc/src/main/flex/DetailRenderer.mxml | 2 +-
examples/flexjs/ChartExample/build.xml | 13 +-
examples/flexjs/ChartExample/pom.xml | 1 +
.../CordovaCameraExample-app.xml | 2 +-
examples/flexjs/CordovaCameraExample/README.txt | 25 +-
examples/flexjs/CordovaCameraExample/build.xml | 67 +-
examples/flexjs/CordovaCameraExample/pom.xml | 1 +
.../src/main/flex/CordovaCameraExample.mxml | 11 +-
.../src/main/flex/MyInitialView.mxml | 36 +-
examples/flexjs/CreateJSExample/build.xml | 13 +-
examples/flexjs/CreateJSExample/pom.xml | 1 +
.../src/main/config/compile-app-config.xml | 4 +-
examples/flexjs/DataBindingExample/build.xml | 13 +-
examples/flexjs/DataBindingExample/pom.xml | 1 +
.../src/main/flex/DataBindingExample.mxml | 7 +
.../DataBindingExampleWithFlexLayout/build.xml | 14 +-
.../flex/DataBindingExampleWithFlexLayout.mxml | 7 +
.../src/main/flex/MyInitialView.mxml | 4 +
.../flexjs/DataBindingExample_Flat/build.xml | 31 +-
examples/flexjs/DataBindingExample_Flat/pom.xml | 2 +
.../src/main/flex/DataBindingExample.mxml | 7 +
.../src/main/flex/MyInitialView.mxml | 10 +-
.../src/main/flex/controllers/MyController.as | 4 +-
examples/flexjs/DataBindingExample_as/build.xml | 14 +-
examples/flexjs/DataBindingExample_as/pom.xml | 1 +
.../src/main/flex/DataBindingExample.as | 173 ++--
.../src/main/flex/MyInitialView.as | 3 +-
.../src/main/flex/controllers/MyController.as | 4 +-
examples/flexjs/DataGridExample/build.xml | 11 +
.../src/main/flex/MyInitialView.mxml | 2 +-
examples/flexjs/DateControlsExample/build.xml | 13 +-
examples/flexjs/DateControlsExample/pom.xml | 1 +
examples/flexjs/DesktopMap/build.xml | 27 +-
examples/flexjs/DesktopMap/pom.xml | 1 +
.../src/main/config/compile-app-config.xml | 4 +-
.../DesktopMap/src/main/flex/DesktopMap.mxml | 6 +-
.../DesktopMap/src/main/flex/MyInitialView.mxml | 4 +-
examples/flexjs/FlexJSStore/build.xml | 14 +-
examples/flexjs/FlexJSStore/pom.xml | 4 +
.../FlexJSStore/src/main/flex/SupportView.mxml | 2 +-
.../flexjs/FlexJSStore/src/main/flex/main.css | 1 +
.../src/main/flex/productsView/ProductCart.mxml | 2 +-
.../flex/productsView/ProductCatalogPanel.mxml | 6 +-
.../productsView/ProductCatalogThumbnail.mxml | 4 +-
examples/flexjs/FlexJSStore_jquery/build.xml | 14 +-
examples/flexjs/FlexJSStore_jquery/pom.xml | 5 +
.../src/main/config/compile-app-config.xml | 4 +-
.../src/main/flex/FlexJSStore.mxml | 8 +-
.../src/main/flex/HomeView.mxml | 194 +++--
.../src/main/flex/ProductsView.mxml | 1 -
.../src/main/flex/SupportView.mxml | 4 +-
.../FlexJSStore_jquery/src/main/flex/main.css | 1 +
.../src/main/flex/productsView/ProductCart.mxml | 2 +-
.../flex/productsView/ProductCatalogPanel.mxml | 6 +-
.../productsView/ProductCatalogThumbnail.mxml | 4 +-
.../flex/samples/flexstore/ProductThumbEvent.as | 19 +-
examples/flexjs/FlexTeamPage_MDL/build.xml | 11 +-
examples/flexjs/FlexTeamPage_MDL/pom.xml | 3 +
.../flexjs/FlexWebsiteStatsViewer/build.xml | 14 +-
examples/flexjs/FlexWebsiteStatsViewer/pom.xml | 2 +
examples/flexjs/HelloWorld/build.xml | 13 +-
examples/flexjs/ListExample/build.xml | 13 +-
examples/flexjs/ListExample/pom.xml | 3 +-
.../src/main/flex/MyInitialView.mxml | 23 +-
.../main/flex/simple/IRFactoryForArrayData.as | 2 +-
examples/flexjs/MDLBlogExample/build.xml | 25 +-
examples/flexjs/MDLBlogExample/pom.xml | 1 +
.../src/main/config/compile-app-config.xml | 27 +
examples/flexjs/MDLDynamicTabsExample/pom.xml | 1 +
examples/flexjs/MDLExample/build.xml | 11 +-
examples/flexjs/MDLExample/pom.xml | 1 +
.../src/main/config/compile-app-config.xml | 1 +
examples/flexjs/MapSearch/MapSearch-app.xml | 4 +-
examples/flexjs/MapSearch/build.xml | 18 +-
examples/flexjs/MapSearch/pom.xml | 1 +
.../src/main/config/compile-app-config.xml | 4 +-
.../MapSearch/src/main/flex/MapSearch.mxml | 9 +-
.../MapSearch/src/main/flex/MyInitialView.mxml | 16 +-
.../flexjs/MapSearch/src/main/flex/NoLayout.as | 26 -
examples/flexjs/MobileMap/MobileMap-app.xml | 252 ++++++
examples/flexjs/MobileMap/README.txt | 6 +-
examples/flexjs/MobileMap/build.xml | 20 +-
examples/flexjs/MobileMap/pom.xml | 2 +
.../src/main/config/compile-app-config.xml | 4 +-
.../MobileMap/src/main/flex/MobileMap.mxml | 2 +-
examples/flexjs/MobileStocks/build.xml | 36 +-
examples/flexjs/MobileStocks/pom.xml | 5 +
.../src/main/config/compile-app-config.xml | 26 +
.../src/main/flex/models/ProductsModel.as | 5 +-
.../src/main/flex/views/LaunchView.mxml | 10 +-
examples/flexjs/MobileTrader/build.xml | 28 +-
examples/flexjs/MobileTrader/pom.xml | 3 +
examples/flexjs/StorageExample/build.xml | 33 +-
examples/flexjs/StorageExample/pom.xml | 16 +-
.../src/main/config/compile-app-config.xml | 4 +-
.../src/main/flex/MyInitialView.mxml | 40 +-
.../src/main/flex/StorageExample.mxml | 19 +-
examples/flexjs/StyleExample/build.xml | 14 +-
examples/flexjs/StyleExample/pom.xml | 1 +
.../src/main/flex/MyInitialView.mxml | 19 +-
examples/flexjs/TableExample/build.xml | 11 +
examples/flexjs/TeamPage/build.xml | 11 +
examples/flexjs/TeamPage/pom.xml | 12 +-
examples/flexjs/TodoListSampleApp/build.xml | 12 +
.../sample/todo/renderers/TodoItemRenderer.mxml | 5 +-
.../flex/sample/todo/views/TodoListView.mxml | 3 +-
examples/flexjs/TreeExample/build.xml | 11 +
examples/flexjs/pom.xml | 6 +
examples/native/ButtonExample/build.xml | 13 +-
.../ButtonExample/src/main/resources/index.html | 30 +
examples/native/USStatesMap/build.xml | 13 +-
.../USStatesMap/src/main/resources/index.html | 30 +
frameworks/air-config-template.xml | 8 +-
frameworks/air-config.xml | 8 +-
frameworks/flex-config-template.xml | 8 +-
frameworks/flex-config.xml | 8 +-
.../src/main/config/compile-js-config.xml | 7 +
.../projects/BindingJS/.actionScriptProperties | 2 +-
.../js/FlexJS/projects/BindingJS/.project | 31 +-
.../src/main/config/compile-js-config.xml | 7 +
.../projects/ChartsJS/.actionScriptProperties | 10 +-
frameworks/js/FlexJS/projects/ChartsJS/.project | 31 +-
.../src/main/config/compile-js-config.xml | 8 +
.../CollectionsJS/.actionScriptProperties | 2 +-
.../js/FlexJS/projects/CollectionsJS/.project | 31 +-
.../src/main/config/compile-js-config.xml | 7 +
.../projects/CoreJS/.actionScriptProperties | 2 +-
frameworks/js/FlexJS/projects/CoreJS/.project | 26 +-
.../src/main/config/compile-js-config.xml | 7 +
.../projects/CreateJSJS/.actionScriptProperties | 7 +-
.../js/FlexJS/projects/CreateJSJS/.project | 31 +-
.../src/main/config/compile-js-config.xml | 7 +
.../projects/DragDropJS/.actionScriptProperties | 2 +-
.../js/FlexJS/projects/DragDropJS/.project | 31 +-
.../src/main/config/compile-js-config.xml | 7 +
.../projects/EffectsJS/.actionScriptProperties | 10 +-
.../js/FlexJS/projects/EffectsJS/.project | 31 +-
.../src/main/config/compile-js-config.xml | 7 +
.../src/main/config/compile-js-config.xml | 7 +
.../projects/FlatJS/.actionScriptProperties | 5 +-
frameworks/js/FlexJS/projects/FlatJS/.project | 31 +-
.../src/main/config/compile-js-config.xml | 7 +
.../src/main/config/compile-js-config.xml | 7 +
.../FormattersJS/.actionScriptProperties | 2 +-
.../js/FlexJS/projects/FormattersJS/.project | 31 +-
.../src/main/config/compile-js-config.xml | 7 +
.../GoogleMapsJS/.actionScriptProperties | 10 +-
.../js/FlexJS/projects/GoogleMapsJS/.project | 31 +-
.../src/main/config/compile-js-config.xml | 9 +-
.../projects/GraphicsJS/.actionScriptProperties | 2 +-
.../js/FlexJS/projects/GraphicsJS/.project | 31 +-
.../src/main/config/compile-js-config.xml | 7 +
.../projects/HTML5JS/.actionScriptProperties | 12 +-
frameworks/js/FlexJS/projects/HTML5JS/.project | 31 +-
.../src/main/config/compile-js-config.xml | 7 +
.../projects/HTMLJS/.actionScriptProperties | 10 +-
frameworks/js/FlexJS/projects/HTMLJS/.project | 31 +-
.../src/main/config/compile-js-config.xml | 7 +
.../projects/JQueryJS/.actionScriptProperties | 11 +-
frameworks/js/FlexJS/projects/JQueryJS/.project | 31 +-
.../src/main/config/compile-js-config.xml | 7 +
.../src/main/config/compile-js-config.xml | 7 +
.../src/main/config/compile-js-config.xml | 7 +
.../projects/MobileJS/.actionScriptProperties | 11 +-
frameworks/js/FlexJS/projects/MobileJS/.project | 31 +-
.../src/main/config/compile-js-config.xml | 7 +
.../projects/NetworkJS/.actionScriptProperties | 2 +-
.../js/FlexJS/projects/NetworkJS/.project | 31 +-
.../src/main/config/compile-js-config.xml | 7 +
.../ReflectionJS/.actionScriptProperties | 2 +-
.../js/FlexJS/projects/ReflectionJS/.project | 31 +-
.../src/main/config/compile-js-config.xml | 7 +
.../src/main/config/compile-js-config.xml | 9 +-
.../src/main/config/compile-js-config.xml | 9 +-
.../XMLJS/src/main/config/compile-js-config.xml | 7 +
frameworks/projects/Basic/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
.../Basic/src/main/flex/BasicClasses.as | 5 +-
.../flex/org/apache/flex/core/AirApplication.as | 115 +++
.../flex/org/apache/flex/core/ContainerBase.as | 4 +
.../main/flex/org/apache/flex/core/GroupBase.as | 22 +
.../flex/org/apache/flex/core/LayoutBase.as | 55 ++
.../main/flex/org/apache/flex/core/UIBase.as | 12 +
.../src/main/flex/org/apache/flex/core/View.as | 2 +-
.../main/flex/org/apache/flex/html/CheckBox.as | 1 +
.../flex/org/apache/flex/html/ControlBar.as | 1 +
.../src/main/flex/org/apache/flex/html/List.as | 2 +
.../flex/org/apache/flex/html/MultilineLabel.as | 1 +
.../flex/org/apache/flex/html/NumericStepper.as | 47 +-
.../main/flex/org/apache/flex/html/Slider.as | 1 +
.../main/flex/org/apache/flex/html/Spinner.as | 2 +-
.../main/flex/org/apache/flex/html/ToolTip.as | 16 +
.../flex/html/beads/AccordionCollapseBead.as | 5 +-
.../html/beads/AccordionItemRendererView.as | 31 +-
.../org/apache/flex/html/beads/AccordionView.as | 62 +-
.../org/apache/flex/html/beads/ComboBoxView.as | 2 +-
.../org/apache/flex/html/beads/ContainerView.as | 4 +-
.../flex/html/beads/DataGridPercentageView.as | 10 +-
.../org/apache/flex/html/beads/DataGridView.as | 10 +-
.../apache/flex/html/beads/DateChooserView.as | 16 +-
.../org/apache/flex/html/beads/DateFieldView.as | 3 +-
.../org/apache/flex/html/beads/GroupView.as | 9 +
.../flex/html/beads/NumericStepperView.as | 61 +-
.../org/apache/flex/html/beads/PanelView.as | 45 +-
.../flex/html/beads/PanelWithControlBarView.as | 4 +-
.../org/apache/flex/html/beads/SpinnerView.as | 31 +-
.../beads/controllers/SliderMouseController.as | 27 +-
.../beads/controllers/SpinnerMouseController.as | 9 +-
.../FlexibleFirstChildHorizontalLayout.as | 25 +-
.../html/beads/layouts/HorizontalFlexLayout.as | 6 +-
.../flex/html/beads/layouts/HorizontalLayout.as | 30 +-
.../HorizontalLayoutWithPaddingAndGap.as | 2 +-
.../layouts/OneFlexibleChildHorizontalLayout.as | 73 +-
...eFlexibleChildHorizontalLayoutForOverflow.as | 311 +++++++
.../layouts/OneFlexibleChildVerticalLayout.as | 70 +-
...OneFlexibleChildVerticalLayoutForOverflow.as | 313 +++++++
.../html/beads/layouts/VerticalFlexLayout.as | 20 +-
.../flex/html/beads/layouts/VerticalLayout.as | 33 +-
.../apache/flex/html/beads/models/RangeModel.as | 6 +-
.../html/beads/models/RangeModelExtended.as | 9 +-
.../flex/html/beads/models/ToggleButtonModel.as | 2 +-
.../html/beads/models/ValueToggleButtonModel.as | 5 +-
.../supportClasses/AccordionItemRenderer.as | 2 +
.../html/supportClasses/DataItemRenderer.as | 22 +-
.../html/supportClasses/ScrollingViewport.as | 14 +-
.../supportClasses/TextButtonItemRenderer.as | 4 +-
.../src/main/flex/org/apache/flex/svg/Circle.as | 12 +-
.../flex/org/apache/flex/svg/CompoundGraphic.as | 12 +-
.../main/flex/org/apache/flex/svg/DOMWrapper.as | 12 +-
.../org/apache/flex/svg/GraphicContainer.as | 12 +-
.../flex/org/apache/flex/svg/GraphicShape.as | 12 +-
.../src/main/flex/org/apache/flex/svg/Image.as | 12 +-
.../src/main/flex/org/apache/flex/svg/Path.as | 12 +-
.../src/main/flex/org/apache/flex/svg/Rect.as | 12 +-
.../Basic/src/main/resources/basic-manifest.xml | 3 +
.../Basic/src/main/resources/defaults.css | 56 +-
frameworks/projects/Binding/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
.../projects/Charts/.actionScriptProperties | 3 +-
frameworks/projects/Charts/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
frameworks/projects/Collections/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
frameworks/projects/Core/build.xml | 6 +-
.../Core/src/main/config/compile-swf-config.xml | 7 +
.../org/apache/flex/core/AllCSSValuesImpl.as | 772 +++++++++++++++++
.../org/apache/flex/core/BindableCSSStyles.as | 2 -
.../flex/core/BindableCSSStylesWithFlex.as | 115 +++
.../org/apache/flex/core/SimpleCSSStyles.as | 10 +-
.../apache/flex/core/SimpleCSSStylesWithFlex.as | 110 +++
.../org/apache/flex/core/SimpleCSSValuesImpl.as | 74 +-
.../org/apache/flex/core/StyleChangeNotifier.as | 2 +-
.../flex/org/apache/flex/events/BrowserEvent.as | 39 +-
.../apache/flex/events/utils/KeyConverter.as | 4 +-
.../Core/src/main/resources/basic-manifest.xml | 3 +
.../projects/CreateJS/.actionScriptProperties | 3 +-
frameworks/projects/CreateJS/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
.../flex/org/apache/flex/createjs/core/View.as | 4 +
frameworks/projects/DragDrop/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
frameworks/projects/Effects/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
.../flex/core/StatesWithTransitionsImpl.as | 4 +-
frameworks/projects/Express/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
.../flex/org/apache/flex/express/Application.as | 4 +-
.../Express/src/main/resources/defaults.css | 5 +
frameworks/projects/Flat/build.xml | 6 +-
.../Flat/src/main/config/compile-swf-config.xml | 7 +
.../flex/org/apache/flex/flat/DropDownList.as | 22 +-
.../Flat/src/main/resources/defaults.css | 45 +-
.../Flat/src/main/resources/flat-manifest.xml | 1 +
frameworks/projects/FontAwesome/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
frameworks/projects/Formatters/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
frameworks/projects/GoogleMaps/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
.../projects/Graphics/.actionScriptProperties | 4 +-
frameworks/projects/Graphics/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
.../flex/org/apache/flex/graphics/CubicCurve.as | 12 +-
.../org/apache/flex/graphics/GradientBase.as | 12 +-
.../org/apache/flex/graphics/GradientEntry.as | 12 +-
.../flex/org/apache/flex/graphics/ICircle.as | 12 +-
.../apache/flex/graphics/ICompoundGraphic.as | 12 +-
.../flex/org/apache/flex/graphics/IDrawable.as | 12 +-
.../flex/org/apache/flex/graphics/IEllipse.as | 12 +-
.../main/flex/org/apache/flex/graphics/IFill.as | 12 +-
.../org/apache/flex/graphics/IGraphicShape.as | 12 +-
.../main/flex/org/apache/flex/graphics/IPath.as | 12 +-
.../org/apache/flex/graphics/IPathCommand.as | 12 +-
.../main/flex/org/apache/flex/graphics/IRect.as | 12 +-
.../flex/org/apache/flex/graphics/IStroke.as | 12 +-
.../main/flex/org/apache/flex/graphics/IText.as | 12 +-
.../flex/org/apache/flex/graphics/LineStyle.as | 12 +-
.../flex/org/apache/flex/graphics/LineTo.as | 12 +-
.../flex/org/apache/flex/graphics/MoveTo.as | 12 +-
.../org/apache/flex/graphics/PathBuilder.as | 12 +-
.../org/apache/flex/graphics/QuadraticCurve.as | 12 +-
.../flex/org/apache/flex/graphics/SolidColor.as | 12 +-
.../apache/flex/graphics/SolidColorStroke.as | 12 +-
.../graphics/utils/AdvancedLayoutFeatures.as | 12 +-
.../flex/graphics/utils/CompoundTransform.as | 12 +-
.../flex/graphics/utils/IAssetLayoutFeatures.as | 12 +-
.../apache/flex/graphics/utils/PathHelper.as | 12 +-
.../flex/graphics/utils/TransformOffsets.as | 12 +-
.../main/flex/org/apache/flex/svg/ClipBead.as | 2 +-
.../flex/org/apache/flex/svg/LinearGradient.as | 12 +-
.../projects/HTML/.actionScriptProperties | 7 +-
frameworks/projects/HTML/build.xml | 6 +-
.../HTML/src/main/config/compile-swf-config.xml | 7 +
.../projects/HTML5/.actionScriptProperties | 4 +-
frameworks/projects/HTML5/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
frameworks/projects/JQuery/build.xml | 6 +-
.../projects/JQuery/js/tests/FlexJSTest.js | 12 +-
.../JQuery/js/tests/MySimpleValuesImpl.js | 12 +-
.../src/main/config/compile-swf-config.xml | 7 +
frameworks/projects/Language/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
.../main/flex/org/apache/flex/utils/Language.as | 100 ---
.../projects/MaterialDesignLite/build.xml | 8 +-
.../src/main/config/compile-swf-config.xml | 7 +
.../org/apache/flex/mdl/NavigationLayout.as | 32 +-
.../beads/controllers/DropDownListController.as | 39 +-
.../flex/mdl/beads/views/DropDownListView.as | 40 +-
.../src/main/resources/defaults.css | 7 +
frameworks/projects/Mobile/build.xml | 8 +-
.../src/main/config/compile-swf-config.xml | 7 +
.../Mobile/src/main/flex/CordovaClasses.as | 8 +-
.../main/flex/org/apache/cordova/Application.as | 86 --
.../src/main/flex/org/apache/cordova/Weinre.as | 88 --
.../flex/org/apache/cordova/camera/Camera.as | 192 -----
.../apache/cordova/geolocation/Geolocation.as | 61 --
.../flex/org/apache/flex/cordova/Application.as | 86 ++
.../main/flex/org/apache/flex/cordova/Camera.as | 168 ++++
.../main/flex/org/apache/flex/cordova/Weinre.as | 88 ++
.../flex/cordova/geolocation/Geolocation.as | 61 ++
.../flex/mobile/beads/StackedViewManagerView.as | 4 +-
.../flex/mobile/beads/TabbedViewManagerView.as | 4 +-
.../src/main/resources/cordova-manifest.xml | 8 +-
frameworks/projects/Network/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
frameworks/projects/Reflection/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
frameworks/projects/Storage/build.xml | 6 +-
.../src/main/config/compile-swf-config.xml | 7 +
.../providers/AndroidExternalStorageProvider.as | 8 +-
frameworks/projects/XML/build.xml | 6 +-
.../XML/src/main/config/compile-swf-config.xml | 7 +
ide/flashbuilder/antscripts.xml | 12 +-
installer.xml | 59 +-
.../src/DataBindingTestbed.mxml | 7 +
.../FlexJSTest_Panel/src/MyInitialView.mxml | 7 +-
.../FlexJSTest_SVG/src/FlexJSTest_SVG.mxml | 7 +
manualtests/build_example.xml | 305 +++----
.../java/src/marmotinni/MarmotinniRunner.java | 9 +
mustella/js/AssertPropertyValue.js | 12 +-
mustella/js/DispatchMouseClickEvent.js | 12 +-
mustella/js/DispatchMouseEvent.js | 12 +-
mustella/js/ExitWhenDone.js | 12 +-
mustella/js/SendFormattedResultsToLog.js | 12 +-
mustella/js/SetProperty.js | 12 +-
mustella/js/SetShowRTE.js | 12 +-
mustella/js/TestCase.js | 12 +-
mustella/js/UnitTester.js | 12 +-
mustella/tests/basicTests/BasicTestsApp.mxml | 7 +
nightly.properties | 2 +-
releasecandidate.xml | 36 +-
402 files changed, 9039 insertions(+), 4291 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
index d2f9015,0251cc0..e07d39a
--- a/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
@@@ -81,8 -81,9 +81,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Language</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>js</classifier>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/archetypes/flexjs-simple-application-pure-swf-archetype/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/distribution/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/distribution/src/main/assembly/component.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/express/DataBindingExample/pom.xml
----------------------------------------------------------------------
diff --cc examples/express/DataBindingExample/pom.xml
index 78e6908,654fb9a..0946a09
--- a/examples/express/DataBindingExample/pom.xml
+++ b/examples/express/DataBindingExample/pom.xml
@@@ -57,7 -60,8 +58,8 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Network</artifactId>
- <version>0.8.0</version>
- <classifier>swf</classifier>
+ <version>0.9.0-SNAPSHOT</version>
++ <classifier>swf</classifier>
<type>swc</type>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/express/pom.xml
----------------------------------------------------------------------
diff --cc examples/express/pom.xml
index 67945a9,2ff8430..08904b4
--- a/examples/express/pom.xml
+++ b/examples/express/pom.xml
@@@ -71,8 -87,9 +85,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Express</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -84,8 -101,9 +99,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Language</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/ASDoc/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/ASDoc/pom.xml
index ab9b743,417a8bb..52f6992
--- a/examples/flexjs/ASDoc/pom.xml
+++ b/examples/flexjs/ASDoc/pom.xml
@@@ -50,8 -52,9 +50,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Network</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/ChartExample/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/ChartExample/pom.xml
index fa404a5,7f4b23c..b3af428
--- a/examples/flexjs/ChartExample/pom.xml
+++ b/examples/flexjs/ChartExample/pom.xml
@@@ -63,8 -65,9 +63,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Charts</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/CordovaCameraExample/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/CordovaCameraExample/pom.xml
index c46b4ad,43e86ea..b2b0318
--- a/examples/flexjs/CordovaCameraExample/pom.xml
+++ b/examples/flexjs/CordovaCameraExample/pom.xml
@@@ -61,8 -63,9 +61,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Mobile</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/CreateJSExample/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/CreateJSExample/pom.xml
index 2abdd25,a59287d..a7d1cf9
--- a/examples/flexjs/CreateJSExample/pom.xml
+++ b/examples/flexjs/CreateJSExample/pom.xml
@@@ -63,8 -65,9 +63,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>CreateJS</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/DataBindingExample/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/DataBindingExample/pom.xml
index 0491632,f94ff9e..d2e1601
--- a/examples/flexjs/DataBindingExample/pom.xml
+++ b/examples/flexjs/DataBindingExample/pom.xml
@@@ -57,8 -59,9 +57,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Network</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/DataBindingExample_Flat/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/DataBindingExample_Flat/pom.xml
index 4aaef62,dd6db2b..f8c0e61
--- a/examples/flexjs/DataBindingExample_Flat/pom.xml
+++ b/examples/flexjs/DataBindingExample_Flat/pom.xml
@@@ -107,8 -109,9 +107,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Flat</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -120,8 -123,9 +121,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Network</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/DataBindingExample_as/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/DataBindingExample_as/pom.xml
index c08b8ce,469b2cd..095e2ba
--- a/examples/flexjs/DataBindingExample_as/pom.xml
+++ b/examples/flexjs/DataBindingExample_as/pom.xml
@@@ -84,8 -86,9 +84,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Network</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/DateControlsExample/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/DateControlsExample/pom.xml
index 43c2c3a,bd698e4..800f54a
--- a/examples/flexjs/DateControlsExample/pom.xml
+++ b/examples/flexjs/DateControlsExample/pom.xml
@@@ -60,8 -62,9 +60,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Formatters</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/DesktopMap/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/DesktopMap/pom.xml
index f9df11b,33d53ea..a778ab1
--- a/examples/flexjs/DesktopMap/pom.xml
+++ b/examples/flexjs/DesktopMap/pom.xml
@@@ -64,8 -66,9 +64,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>GoogleMaps</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/FlexJSStore/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/FlexJSStore/pom.xml
index 18c2ada,7d625eb..680bd17
--- a/examples/flexjs/FlexJSStore/pom.xml
+++ b/examples/flexjs/FlexJSStore/pom.xml
@@@ -84,8 -86,9 +84,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>DragDrop</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -97,8 -100,9 +98,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Effects</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -110,8 -114,9 +112,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Formatters</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -123,8 -128,9 +126,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Network</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/FlexJSStore_jquery/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/FlexJSStore_jquery/pom.xml
index 9c20e0a,52c5da3..082c67b
--- a/examples/flexjs/FlexJSStore_jquery/pom.xml
+++ b/examples/flexjs/FlexJSStore_jquery/pom.xml
@@@ -72,8 -74,9 +72,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>DragDrop</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -85,8 -88,9 +86,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Effects</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -98,8 -102,9 +100,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Formatters</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -111,8 -116,9 +114,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>JQuery</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -124,8 -130,9 +128,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Network</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/FlexTeamPage_MDL/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/FlexTeamPage_MDL/pom.xml
index 0ced478,d57b5f1..3baaa3c
--- a/examples/flexjs/FlexTeamPage_MDL/pom.xml
+++ b/examples/flexjs/FlexTeamPage_MDL/pom.xml
@@@ -64,8 -66,9 +64,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>MaterialDesignLite</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -77,8 -80,9 +78,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>FontAwesome</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -90,8 -94,9 +92,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Network</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/FlexWebsiteStatsViewer/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/FlexWebsiteStatsViewer/pom.xml
index e0a3c39,75dc3b1..1e48dfa
--- a/examples/flexjs/FlexWebsiteStatsViewer/pom.xml
+++ b/examples/flexjs/FlexWebsiteStatsViewer/pom.xml
@@@ -58,8 -60,9 +58,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Network</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -71,8 -74,9 +72,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Charts</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/ListExample/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/ListExample/pom.xml
index 47cfc07,b03ce5b..a7b137e
--- a/examples/flexjs/ListExample/pom.xml
+++ b/examples/flexjs/ListExample/pom.xml
@@@ -61,8 -63,9 +61,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Network</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/MDLBlogExample/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/MDLBlogExample/pom.xml
index c72f4cc,262a020..6ad5983
--- a/examples/flexjs/MDLBlogExample/pom.xml
+++ b/examples/flexjs/MDLBlogExample/pom.xml
@@@ -66,8 -66,9 +66,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>MaterialDesignLite</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>js</classifier>
</dependency>
<!-- Needed for Flash compilation -->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/MDLDynamicTabsExample/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/MDLDynamicTabsExample/pom.xml
index 3114ef2,aea8a6b..66dd34a
--- a/examples/flexjs/MDLDynamicTabsExample/pom.xml
+++ b/examples/flexjs/MDLDynamicTabsExample/pom.xml
@@@ -68,8 -70,9 +68,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>MaterialDesignLite</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/MDLExample/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/MDLExample/pom.xml
index 92c9117,9717af0..aaf54ea
--- a/examples/flexjs/MDLExample/pom.xml
+++ b/examples/flexjs/MDLExample/pom.xml
@@@ -64,8 -66,9 +64,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>MaterialDesignLite</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/MapSearch/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/MapSearch/pom.xml
index a4db197,56efc24..9709e1e
--- a/examples/flexjs/MapSearch/pom.xml
+++ b/examples/flexjs/MapSearch/pom.xml
@@@ -68,8 -70,9 +68,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>GoogleMaps</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/MobileMap/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/MobileMap/pom.xml
index 67bde92,93950b7..cec2b6f
--- a/examples/flexjs/MobileMap/pom.xml
+++ b/examples/flexjs/MobileMap/pom.xml
@@@ -66,8 -68,9 +66,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Mobile</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -79,8 -82,9 +80,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>GoogleMaps</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/MobileStocks/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/MobileStocks/pom.xml
index 1d8ce7d,c7741d4..01c0748
--- a/examples/flexjs/MobileStocks/pom.xml
+++ b/examples/flexjs/MobileStocks/pom.xml
@@@ -68,8 -70,9 +68,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Charts</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -81,8 -84,9 +82,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Mobile</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -94,8 -98,9 +96,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Network</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -107,8 -112,9 +110,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Storage</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -120,8 -126,9 +124,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>XML</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/MobileTrader/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/MobileTrader/pom.xml
index cf58798,26e6545..f0b9acf
--- a/examples/flexjs/MobileTrader/pom.xml
+++ b/examples/flexjs/MobileTrader/pom.xml
@@@ -68,8 -70,9 +68,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Charts</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -81,8 -84,9 +82,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Mobile</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -94,8 -98,9 +96,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Network</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/StorageExample/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/StorageExample/pom.xml
index 6f159bf,edd6919..081cb7f
--- a/examples/flexjs/StorageExample/pom.xml
+++ b/examples/flexjs/StorageExample/pom.xml
@@@ -61,8 -63,9 +61,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Storage</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/StyleExample/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/StyleExample/pom.xml
index b5f7936,cfff0e5..a98dc69
--- a/examples/flexjs/StyleExample/pom.xml
+++ b/examples/flexjs/StyleExample/pom.xml
@@@ -69,8 -71,9 +69,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Network</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/TeamPage/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/TeamPage/pom.xml
index fcbaa33,8044388..e9bd2c1
--- a/examples/flexjs/TeamPage/pom.xml
+++ b/examples/flexjs/TeamPage/pom.xml
@@@ -53,8 -62,9 +60,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Network</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/examples/flexjs/pom.xml
----------------------------------------------------------------------
diff --cc examples/flexjs/pom.xml
index bffa25d,a59730d..2dd2455
--- a/examples/flexjs/pom.xml
+++ b/examples/flexjs/pom.xml
@@@ -98,8 -100,9 +98,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Core</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -111,8 -114,9 +112,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Language</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -124,8 -128,9 +126,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>HTML</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -137,8 -142,9 +140,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Collections</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -150,8 -156,9 +154,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Binding</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@@ -163,8 -170,9 +168,9 @@@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Graphics</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/frameworks/projects/Basic/src/main/flex/BasicClasses.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
index efde41b,1db7e23..432c8d2
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
@@@ -369,8 -369,10 +369,10 @@@ package org.apache.flex.cor
{
var pixels:Number;
var strpixels:String = positioner.style.width as String;
- if (strpixels !== null && strpixels.indexOf('%') != -1)
+ if (strpixels !== null && strpixels.indexOf('%') !== -1)
pixels = NaN;
+ else if (strpixels === "")
+ pixels = NaN;
else
pixels = parseFloat(strpixels);
if (isNaN(pixels)) {
@@@ -461,8 -463,10 +463,10 @@@
{
var pixels:Number;
var strpixels:String = positioner.style.height as String;
- if (strpixels !== null && strpixels.indexOf('%') != -1)
+ if (strpixels !== null && strpixels.indexOf('%') !== -1)
pixels = NaN;
+ else if (strpixels === "")
+ pixels = NaN;
else
pixels = parseFloat(strpixels);
if (isNaN(pixels)) {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ContainerView.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd98bf0c/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
index b63db1a,0bdc8c1..b427e9c
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
@@@ -606,29 -593,40 +607,40 @@@ package org.apache.flex.cor
for each (var part:String in parts)
{
var pieces:Array = StringUtil.splitAndTrim(part, ":");
+ if (pieces.length < 2) continue;
+ var valueName:String = pieces[0];
+ var c:int = valueName.indexOf("-");
+ while (c != -1)
+ {
+ valueName = valueName.substr(0, c) +
+ valueName.charAt(c + 1).toUpperCase() +
+ valueName.substr(c + 2);
+ c = valueName.indexOf("-");
+ }
+
var value:String = pieces[1];
- if (value == "null")
+ if (value === "null")
- obj[pieces[0]] = null;
+ obj[valueName] = null;
- else if (value == "true")
+ else if (value === "true")
- obj[pieces[0]] = true;
+ obj[valueName] = true;
- else if (value == "false")
+ else if (value === "false")
- obj[pieces[0]] = false;
+ obj[valueName] = false;
else
{
var n:Number = Number(value);
if (isNaN(n))
{
- if (value.charAt(0) == "#" || value.indexOf("rgb") == 0)
+ if (value.charAt(0) === "#" || value.indexOf("rgb") === 0)
{
- obj[pieces[0]] = CSSUtils.toColor(value);
+ obj[valueName] = CSSUtils.toColor(value);
}
else
{
- if (value.charAt(0) == "'")
+ if (value.charAt(0) === "'")
value = value.substr(1, value.length - 2);
- else if (value.charAt(0) == '"')
+ else if (value.charAt(0) === '"')
value = value.substr(1, value.length - 2);
- obj[pieces[0]] = value;
+ obj[valueName] = value;
}
}
else
@@@ -645,15 -643,19 +657,19 @@@
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
+ *
+ * @flexjsignorecoercion HTMLStyleElement
+ * @flexjsignorecoercion CSSStyleSheet
+ * @flexjsignorecoercion uint
*/
- public function addRule(ruleName:String, values:Object):void
+ public function addRule(ruleName:String, ruleValues:Object):void
{
var asValues:Object = {};
- for (var valueName:String in values)
+ for (var valueName:String in ruleValues)
{
- var v:* = values[valueName];
+ var v:* = ruleValues[valueName];
var c:int = valueName.indexOf("-");
- while (c != -1)
+ while (c !== -1)
{
valueName = valueName.substr(0, c) +
valueName.charAt(c + 1).toUpperCase() +
@@@ -662,8 -664,41 +678,41 @@@
}
asValues[valueName] = v;
}
- this.values[ruleName] = asValues;
+ values[ruleName] = asValues;
+ COMPILE::JS
+ {
+ if (!ss)
+ {
+ var styleElement:HTMLStyleElement = document.createElement('style') as HTMLStyleElement;
+ document.head.appendChild(styleElement);
+ ss = styleElement.sheet as CSSStyleSheet;
+ }
+ var cssString:String = ruleName + " {"
+ for (var p:String in values)
+ {
+ var value:Object = values[p];
+ if (typeof(value) === 'function') continue;
+ cssString += p + ": ";
+ if (typeof(value) == 'number') {
+ if (colorStyles[p])
+ value = CSSUtils.attributeFromColor(value as uint);
+ else
+ value = value.toString() + 'px';
+ }
+ else if (p == 'backgroundImage') {
+ if (p.indexOf('url') !== 0)
+ value = 'url(' + value + ')';
+ }
+ cssString += value + ";";
+
+ }
+ cssString += "}";
+ ss.insertRule(cssString, ss.cssRules.length);
+ }
}
+
+ COMPILE::JS
+ private var ss:CSSStyleSheet;
/**
* A map of inheriting styles
@@@ -704,16 -739,8 +753,8 @@@
'backgroundColor': 1,
'borderColor': 1,
'color': 1
- }
+ };
- /**
- * The styles that can use raw numbers
- */
- COMPILE::JS
- public static const numericStyles:Object = {
- 'fontWeight': 1
- };
-
/**
* The properties that enumerate that we skip
@@@ -748,11 -774,9 +788,9 @@@
var value:* = styles[p];
if (value === undefined)
continue;
- if (typeof(value) == 'number') {
+ if (typeof(value) === 'number') {
if (colorStyles[p])
value = CSSUtils.attributeFromColor(value);
- else if (numericStyles[p])
- value = value.toString();
else
value = value.toString() + 'px';
}
[02/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 - First
version of DropDownList after redesign. DropDownList now use native HTML
"select" with options and operates on it. - This basic desing displays
DropDownList but there need to be tested
Posted by ha...@apache.org.
FLEX-35328 - First version of DropDownList after redesign. DropDownList now use native HTML "select" with options and operates on it.
- This basic desing displays DropDownList but there need to be tested several scenarios related to "change" event and model properties
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c4ee9757
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c4ee9757
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c4ee9757
Branch: refs/heads/tlf
Commit: c4ee975771296ace477fb53ae2dd26c2265af08a
Parents: fd98bf0
Author: piotrz <pi...@apache.org>
Authored: Fri Jun 23 00:35:39 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Fri Jun 23 00:35:39 2017 +0200
----------------------------------------------------------------------
examples/flexjs/DesktopMap/DesktopMap-app.xml | 2 +-
.../MDLExample/src/main/flex/DropDownList.mxml | 3 +-
.../flex/org/apache/flex/mdl/DropDownList.as | 121 +++++----
.../src/main/flex/org/apache/flex/mdl/List.as | 258 -------------------
.../beads/controllers/DropDownListController.as | 37 +--
.../flex/mdl/beads/views/DropDownListView.as | 97 ++-----
.../itemRenderers/DropDownListItemRenderer.as | 157 +++++++++++
.../src/main/resources/defaults.css | 8 +-
.../src/main/resources/mdl-manifest.xml | 2 +
9 files changed, 281 insertions(+), 404 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4ee9757/examples/flexjs/DesktopMap/DesktopMap-app.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/DesktopMap-app.xml b/examples/flexjs/DesktopMap/DesktopMap-app.xml
index 7d93fd8..5249aae 100644
--- a/examples/flexjs/DesktopMap/DesktopMap-app.xml
+++ b/examples/flexjs/DesktopMap/DesktopMap-app.xml
@@ -45,7 +45,7 @@
<!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade.
Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
An updated version of application must have a versionNumber value higher than the previous version. Required for namespace >= 2.5 . -->
- <versionNumber>0.8.0</versionNumber>
+ <versionNumber>0.9.0</versionNumber>
<!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
<!-- <versionLabel></versionLabel> -->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4ee9757/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml b/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
index 48ccfa5..72aa9e9 100644
--- a/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
@@ -29,8 +29,7 @@ limitations under the License.
<models:MenuModel id="menuModel"/>
</mdl:model>
<mdl:Grid width="100">
- <mdl:DropDownList id="dropDownList" labelField="label" width="150"
- selectedIndex="0" change="onDplChange(event)">
+ <mdl:DropDownList id="dropDownList" labelField="label" width="150" change="onDplChange(event)">
<mdl:beads>
<js:ConstantBinding
sourceID="menuModel"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4ee9757/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
index 1e28630..8b2c430 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
@@ -18,9 +18,15 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mdl
{
+ import org.apache.flex.core.IItemRenderer;
import org.apache.flex.core.ISelectionModel;
- import org.apache.flex.html.Group;
- import org.apache.flex.mdl.materialIcons.IMaterialIcon;
+ import org.apache.flex.events.ItemAddedEvent;
+ import org.apache.flex.html.DataContainer;
+
+ COMPILE::JS
+ {
+ import org.apache.flex.core.WrappedHTMLElement;
+ }
[Event(name="change", type="org.apache.flex.events.Event")]
@@ -39,7 +45,7 @@ package org.apache.flex.mdl
* @playerversion AIR 2.6
* @productversion FlexJS 0.8
*/
- public class DropDownList extends Group
+ public class DropDownList extends DataContainer
{
/**
* Constructor.
@@ -54,25 +60,46 @@ package org.apache.flex.mdl
super();
}
- private var _icon:IMaterialIcon;
+ COMPILE::JS
+ protected var _labelDisplay:HTMLLabelElement;
+ COMPILE::JS
+ protected var _dropDown:HTMLSelectElement;
- /**
- * The data for display by the DropDownList.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public function get dataProvider():Object
- {
- return ISelectionModel(model).dataProvider;
- }
- public function set dataProvider(value:Object):void
+ COMPILE::JS
{
- ISelectionModel(model).dataProvider = value;
- }
+ /**
+ * @flexjsignorecoercion HTMLSelectElement
+ */
+ public function get dropDown():HTMLSelectElement
+ {
+ return _dropDown;
+ }
+ /**
+ * @flexjsignorecoercion HTMLSelectElement
+ */
+ public function set dropDown(value:HTMLSelectElement):void
+ {
+ _dropDown = value;
+ }
+
+ /**
+ * @flexjsignorecoercion HTMLLabelElement
+ */
+ public function get labelDisplay():HTMLLabelElement
+ {
+ return _labelDisplay;
+ }
+
+ /**
+ * @flexjsignorecoercion HTMLLabelElement
+ */
+ public function set labelDisplay(value:HTMLLabelElement):void
+ {
+ _labelDisplay = value;
+ }
+ }
+
[Bindable("change")]
/**
* @copy org.apache.flex.core.ISelectionModel#selectedIndex
@@ -109,40 +136,48 @@ package org.apache.flex.mdl
ISelectionModel(model).selectedItem = value;
}
- /**
- * @copy org.apache.flex.core.ISelectionModel#labelField
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public function get labelField():String
+ override public function removeAllItemRenderers():void
{
- return ISelectionModel(model).labelField;
+ COMPILE::JS
+ {
+ var options:HTMLOptionsCollection = dropDown.options;
+ var optionsCount:int = options.length;
+
+ for (var i:int = 1; i < optionsCount; i++)
+ {
+ dropDown.remove(i);
+ }
+ }
}
- public function set labelField(value:String):void
+ override public function addItemRenderer(renderer:IItemRenderer):void
{
- ISelectionModel(model).labelField = value;
+ COMPILE::JS
+ {
+ dropDown.appendChild(renderer.element);
+ }
+
+ var newEvent:ItemAddedEvent = new ItemAddedEvent("itemAdded");
+ newEvent.item = renderer;
+
+ dispatchEvent(newEvent);
}
/**
- * DropDownList material icon - default: MaterialIconType.ARROW_DROP_DOWN
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
*/
- public function get icon():IMaterialIcon
+ COMPILE::JS
+ override protected function createElement():WrappedHTMLElement
{
- return _icon;
- }
+ typeNames = 'mdl-textfield mdl-js-textfield';
+
+ element = document.createElement('div') as WrappedHTMLElement;
+ element.classList.add("mdl-textfield--floating-label");
- public function set icon(value:IMaterialIcon):void
- {
- _icon = value;
+ positioner = element;
+ element.flexjs_wrapper = this;
+
+ return element;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4ee9757/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/List.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/List.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/List.as
index 3c8d3aa..23c1a3c 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/List.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/List.as
@@ -18,19 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mdl
{
- import org.apache.flex.core.IItemRenderer;
- import org.apache.flex.core.IItemRendererParent;
- import org.apache.flex.core.IList;
- import org.apache.flex.core.ILayoutHost;
- import org.apache.flex.core.ILayoutParent;
- import org.apache.flex.core.ILayoutView;
- import org.apache.flex.core.ISelectionModel;
- import org.apache.flex.core.IFactory;
- import org.apache.flex.core.UIBase;
- import org.apache.flex.core.IChild;
- import org.apache.flex.events.ItemAddedEvent;
- import org.apache.flex.events.ItemRemovedEvent;
- import org.apache.flex.core.ListBase;
import org.apache.flex.html.List;
COMPILE::JS
@@ -68,249 +55,4 @@ package org.apache.flex.mdl
return positioner;
}
}
-
-// This is the previous version of List. Please discard when sure the new List class works.
-//
-// public class List extends UIBase implements IItemRendererParent, ILayoutParent, ILayoutHost, ILayoutView, IList
-// {
-// /**
-// * Constructor.
-// *
-// * @langversion 3.0
-// * @playerversion Flash 10.2
-// * @playerversion AIR 2.6
-// * @productversion FlexJS 0.8
-// */
-// public function List()
-// {
-// super();
-//
-// className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
-// }
-//
-// /**
-// * @copy org.apache.flex.core.IDataProviderModel#dataProvider
-// *
-// * @langversion 3.0
-// * @playerversion Flash 10.2
-// * @playerversion AIR 2.6
-// * @productversion FlexJS 0.8
-// */
-// public function get dataProvider():Object
-// {
-// return ISelectionModel(model).dataProvider;
-// }
-// /**
-// * @private
-// */
-// public function set dataProvider(value:Object):void
-// {
-// ISelectionModel(model).dataProvider = value;
-// }
-//
-// /**
-// * @copy org.apache.flex.core.IDataProviderModel#labelField
-// *
-// * @langversion 3.0
-// * @playerversion Flash 10.2
-// * @playerversion AIR 2.6
-// * @productversion FlexJS 0.8
-// */
-// public function get labelField():String
-// {
-// return ISelectionModel(model).labelField;
-// }
-// /**
-// * @private
-// */
-// public function set labelField(value:String):void
-// {
-// ISelectionModel(model).labelField = value;
-// }
-//
-// /**
-// * get layout host
-// *
-// * @langversion 3.0
-// * @playerversion Flash 10.2
-// * @playerversion AIR 2.6
-// * @productversion FlexJS 0.8
-// */
-// public function getLayoutHost():ILayoutHost
-// {
-// return this;
-// }
-//
-// /**
-// * get content view
-// *
-// * @langversion 3.0
-// * @playerversion Flash 10.2
-// * @playerversion AIR 2.6
-// * @productversion FlexJS 0.8
-// */
-// public function get contentView():ILayoutView
-// {
-// return this;
-// }
-//
-// /**
-// * @copy org.apache.flex.core.IList#dataGroup
-// *
-// * @langversion 3.0
-// * @playerversion Flash 10.2
-// * @playerversion AIR 2.6
-// * @productversion FlexJS 0.8
-// */
-// public function get dataGroup():IItemRendererParent
-// {
-// return this;
-// }
-//
-// private var _itemRenderer:IFactory;
-//
-// /**
-// * The class or factory used to display each item.
-// *
-// * @langversion 3.0
-// * @playerversion Flash 10.2
-// * @playerversion AIR 2.6
-// * @productversion FlexJS 0.0
-// */
-// public function get itemRenderer():IFactory
-// {
-// return _itemRenderer;
-// }
-// public function set itemRenderer(value:IFactory):void
-// {
-// _itemRenderer = value;
-// }
-//
-// /**
-// * Returns whether or not the itemRenderer property has been set.
-// *
-// * @see org.apache.flex.core.IItemRendererProvider
-// *
-// * @langversion 3.0
-// * @playerversion Flash 10.2
-// * @playerversion AIR 2.6
-// * @productversion FlexJS 0.8
-// */
-// public function get hasItemRenderer():Boolean
-// {
-// var result:Boolean = false;
-//
-// COMPILE::SWF {
-// result = _itemRenderer != null;
-// }
-//
-// COMPILE::JS {
-// var test:* = _itemRenderer;
-// result = _itemRenderer !== null && test !== undefined;
-// }
-//
-// return result;
-// }
-//
-// /**
-// * @copy org.apache.flex.core.IItemRendererParent#addItemRenderer()
-// * @private
-// *
-// * @langversion 3.0
-// * @playerversion Flash 10.2
-// * @playerversion AIR 2.6
-// * @productversion FlexJS 0.8
-// */
-// public function addItemRenderer(renderer:IItemRenderer):void
-// {
-// addElement(renderer, true);
-//
-// var newEvent:ItemAddedEvent = new ItemAddedEvent("itemAdded");
-// newEvent.item = renderer;
-//
-// dispatchEvent(newEvent);
-// }
-//
-// /**
-// * @copy org.apache.flex.core.IItemRendererParent#removeItemRenderer()
-// * @private
-// *
-// * @langversion 3.0
-// * @playerversion Flash 10.2
-// * @playerversion AIR 2.6
-// * @productversion FlexJS 0.8
-// */
-// public function removeItemRenderer(renderer:IItemRenderer):void
-// {
-// removeElement(renderer, true);
-//
-// var newEvent:ItemRemovedEvent = new ItemRemovedEvent("itemRemoved");
-// newEvent.item = renderer;
-//
-// dispatchEvent(newEvent);
-// }
-//
-// /**
-// * get item renderer for index
-// *
-// * @langversion 3.0
-// * @playerversion Flash 10.2
-// * @playerversion AIR 2.6
-// * @productversion FlexJS 0.8
-// */
-// public function getItemRendererForIndex(index:int):IItemRenderer
-// {
-// var child:IItemRenderer = getElementAt(index) as IItemRenderer;
-// return child;
-// }
-//
-// /**
-// * remove all elements
-// *
-// * @langversion 3.0
-// * @playerversion Flash 10.2
-// * @playerversion AIR 2.6
-// * @productversion FlexJS 0.8
-// */
-// public function removeAllItemRenderers():void
-// {
-// while (numElements > 0) {
-// var child:IChild = getElementAt(0);
-// removeElement(child);
-// }
-// }
-//
-// /**
-// * update all item renderers
-// *
-// * @langversion 3.0
-// * @playerversion Flash 10.2
-// * @playerversion AIR 2.6
-// * @productversion FlexJS 0.8
-// */
-// public function updateAllItemRenderers():void
-// {
-// //todo: IItemRenderer does not define update function but DataItemRenderer does
-// //for(var i:int = 0; i < numElements; i++) {
-// // var child:IItemRenderer = getElementAt(i) as IItemRenderer;
-// // child.update();
-// //}
-// }
-//
-// /**
-// * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
-// */
-// COMPILE::JS
-// override protected function createElement():WrappedHTMLElement
-// {
-// typeNames = "mdl-list";
-//
-// element = document.createElement('ul') as WrappedHTMLElement;
-//
-// positioner = element;
-// element.flexjs_wrapper = this;
-//
-// return positioner;
-// }
-// }
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4ee9757/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
index 32268db..53c37ef 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
@@ -22,15 +22,14 @@ package org.apache.flex.mdl.beads.controllers
import org.apache.flex.core.ISelectionModel;
import org.apache.flex.core.IStrand;
import org.apache.flex.events.IEventDispatcher;
+ import org.apache.flex.mdl.DropDownList;
import org.apache.flex.mdl.beads.views.DropDownListView;
import org.apache.flex.events.Event;
- import org.apache.flex.events.MouseEvent;
/**
* The DropDownListController class bead handles mouse events on the
- * drop down list (org.apache.flex.mdl.Menu) component parts and
- * dispatches change event on behalf of the DropDownList
- *
+ * drop down list component parts and dispatches change event on behalf of the DropDownList
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@ -75,35 +74,25 @@ package org.apache.flex.mdl.beads.controllers
{
_strand = value;
- model = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
- dropDownListView = value.getBeadByType(DropDownListView) as DropDownListView;
+ var dropDownList:DropDownList = (value as DropDownList);
- dropDownListView.dropDown.addEventListener(MouseEvent.CLICK, onDisplayItemClick);
+ model = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
- setLabelDisplayValue();
+ COMPILE::JS
+ {
+ dropDownList.dropDown.addEventListener("onchange", onDisplayItemClick, false);
+ }
}
- private function onDisplayItemClick(event:MouseEvent):void
+ COMPILE::JS
+ private function onDisplayItemClick(event:Event):void
{
var eventTarget:Object = event.target;
- model.selectedIndex = eventTarget.index;
- model.selectedItem = eventTarget.data;
-
- setLabelDisplayValue();
+ model.selectedIndex = eventTarget.selectedIndex;
+ model.selectedItem = model.dataProvider[model.selectedIndex];
IEventDispatcher(_strand).dispatchEvent(new Event(Event.CHANGE));
}
-
- private function setLabelDisplayValue():void
- {
- if (model.selectedIndex > -1 && model.dataProvider != null)
- {
- var selectedItem:Object = model.dataProvider[model.selectedIndex];
- dropDownListView.labelDisplay.text = !model.labelField ?
- selectedItem as String :
- selectedItem[model.labelField];
- }
- }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4ee9757/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as
index ae1d2df..51960d6 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as
@@ -18,14 +18,9 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mdl.beads.views
{
- import org.apache.flex.core.ISelectionModel;
import org.apache.flex.core.IStrand;
- import org.apache.flex.html.Div;
- import org.apache.flex.html.beads.GroupView;
+ import org.apache.flex.html.beads.DataContainerView;
import org.apache.flex.mdl.DropDownList;
- import org.apache.flex.mdl.Menu;
- import org.apache.flex.mdl.materialIcons.MaterialIcon;
- import org.apache.flex.mdl.materialIcons.MaterialIconType;
import org.apache.flex.events.Event;
/**
@@ -39,28 +34,20 @@ package org.apache.flex.mdl.beads.views
* @playerversion AIR 2.6
* @productversion FlexJS 0.8
*/
- public class DropDownListView extends GroupView
+ public class DropDownListView extends DataContainerView
{
public function DropDownListView()
{
super();
}
- protected var _dropDown:Menu;
- protected var _labelDisplay:Div;
-
- public function get dropDown():Menu
- {
- return _dropDown;
- }
-
- public function get labelDisplay():Div
- {
- return _labelDisplay;
- }
/**
* @copy org.apache.flex.core.IBead#strand
*
+ * @flexjsignorecoercion HTMLLabelElement
+ * @flexjsignorecoercion HTMLSelectElement
+ * @flexjsignorecoercion HTMLOptionElement
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@ -70,32 +57,26 @@ package org.apache.flex.mdl.beads.views
{
super.strand = value;
- var dropDownList:DropDownList = (value as DropDownList);
-
- _dropDown = new Menu();
- _dropDown.bottom = true;
-
COMPILE::JS
{
- _dropDown.element.addEventListener("mdl-componentupgraded", onElementMdlComponentUpgraded, false);
- setIdForDisplayList();
- }
+ var dropDownList:DropDownList = (value as DropDownList);
- _labelDisplay = new Div();
+ dropDownList.labelDisplay = document.createElement('label') as HTMLLabelElement;
+ dropDownList.labelDisplay.classList.add("mdl-textfield__label");
- if (!dropDownList.icon)
- {
- var dropDownIcon:MaterialIcon = new MaterialIcon();
- dropDownIcon.text = MaterialIconType.ARROW_DROP_DOWN;
- dropDownList.icon = dropDownIcon;
- }
+ dropDownList.dropDown = document.createElement('select') as HTMLSelectElement;
+ dropDownList.dropDown.classList.add("mdl-textfield__input");
+
+ var emptyOption:HTMLOptionElement = document.createElement('option') as HTMLOptionElement;
+ emptyOption.style.display = "none";
- var model:ISelectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
- _dropDown.model = model;
+ dropDownList.dropDown.appendChild(emptyOption);
+
+ setNameForDropDownList();
- dropDownList.addElement(_labelDisplay);
- dropDownList.addElement(dropDownList.icon);
- dropDownList.addElement(_dropDown);
+ dropDownList.element.appendChild(dropDownList.labelDisplay);
+ dropDownList.element.appendChild(dropDownList.dropDown);
+ }
}
override protected function handleInitComplete(event:Event):void
@@ -105,45 +86,17 @@ package org.apache.flex.mdl.beads.views
COMPILE::JS
{
host.element.classList.add("DropDownList");
-
- setWidthForDropDownListComponents();
- }
- }
-
- COMPILE::JS
- private function setIdForDisplayList():void
- {
- if (!host.element.id)
- {
- host.element.id = "dropDownList" + Math.random();
}
-
- _dropDown.dataMdlFor = host.element.id;
}
COMPILE::JS
- private function setWidthForDropDownListComponents():void
+ private function setNameForDropDownList():void
{
- if (!isNaN(host.width))
- {
- _dropDown.width = host.width - 1;
- _labelDisplay.width = host.width - 25;
- }
- else
- {
- _labelDisplay.width = 30;
- }
- }
+ var dropDownList:DropDownList = (_strand as DropDownList);
- COMPILE::JS
- private function onElementMdlComponentUpgraded(event:Event):void
- {
- if (!event.currentTarget) return;
- if (_dropDown)
- {
- _dropDown.element.removeEventListener("mdl-componentupgraded", onElementMdlComponentUpgraded, false);
- _dropDown.element.style.minWidth = "40px";
- }
+ var name:String = "dropDownList" + Math.random();
+ dropDownList.labelDisplay.htmlFor = name;
+ dropDownList.dropDown.name = name;
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4ee9757/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/DropDownListItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/DropDownListItemRenderer.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/DropDownListItemRenderer.as
new file mode 100644
index 0000000..65e13e1
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/DropDownListItemRenderer.as
@@ -0,0 +1,157 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.mdl.itemRenderers
+{
+ import org.apache.flex.html.supportClasses.MXMLItemRenderer;
+
+ COMPILE::JS
+ {
+ import org.apache.flex.core.WrappedHTMLElement;
+ }
+
+ /**
+ * The DropDownListItemRenderer class creates a DropDownList menu item
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ public class DropDownListItemRenderer extends MXMLItemRenderer
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ public function DropDownListItemRenderer()
+ {
+ super();
+
+ className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
+ }
+
+ private var _text:String = "";
+
+ /**
+ * The text of the menu item
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ public function get text():String
+ {
+ COMPILE::SWF
+ {
+ return _text;
+ }
+ COMPILE::JS
+ {
+ return textNode.nodeValue;
+ }
+ }
+
+ public function set text(value:String):void
+ {
+ COMPILE::SWF
+ {
+ _text = value;
+ }
+ COMPILE::JS
+ {
+ textNode.nodeValue = value;
+ }
+ }
+
+ COMPILE::JS
+ private var textNode:Text;
+
+ COMPILE::JS
+ private var item:HTMLOptionElement;
+
+ /**
+ * Sets the data value and uses the String version of the data for display.
+ *
+ * @param Object data The object being displayed by the itemRenderer instance.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ override public function set data(value:Object):void
+ {
+ super.data = value;
+
+ var text:String;
+ if (labelField)
+ {
+ text = String(value[labelField]);
+ }
+ else
+ {
+ text = String(value);
+ }
+
+ COMPILE::JS
+ {
+ if (dataField)
+ {
+ item.value = String(value[dataField]);
+ }
+ else
+ {
+ item.value = String(value);
+ }
+
+ if(textNode != null)
+ {
+ textNode.nodeValue = text;
+ }
+ }
+ }
+
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ * @flexjsignorecoercion HTMLOptionElement
+ *
+ * @flexjsignorecoercion Text
+ */
+ COMPILE::JS
+ override protected function createElement():WrappedHTMLElement
+ {
+ item = document.createElement('option') as HTMLOptionElement;
+
+ textNode = document.createTextNode('') as Text;
+ item.appendChild(textNode);
+
+ element = item as WrappedHTMLElement;
+
+ positioner = element;
+ element.flexjs_wrapper = this;
+
+ return element;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4ee9757/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
index fa2d39a..347c226 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
@@ -155,11 +155,11 @@ DropDownList
{
IBeadView: ClassReference("org.apache.flex.mdl.beads.views.DropDownListView");
IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
- IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HorizontalFlexLayout");
+ IBeadLayout: ClassReference(null);
IBeadController: ClassReference("org.apache.flex.mdl.beads.controllers.DropDownListController");
- border: 1.2px solid #F8F8F8;
- cursor: pointer;
- align-items: center;
+ IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
+ IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
+ IItemRenderer: ClassReference("org.apache.flex.mdl.itemRenderers.DropDownListItemRenderer");
}
@media -flex-flash
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4ee9757/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
index c74d257..53ce2fb 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
@@ -121,4 +121,6 @@
<component id="UpgradeChildren" class="org.apache.flex.mdl.beads.UpgradeChildren"/>
<component id="DropDownList" class="org.apache.flex.mdl.DropDownList"/>
<component id="DropDownListView" class="org.apache.flex.mdl.beads.views.DropDownListView"/>
+ <component id="DropDownListItemRenderer" class="org.apache.flex.mdl.itemRenderers.DropDownListItemRenderer"/>W
+
</componentPackage>
[18/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 -
Change IDataFieldProviderModel to bead DataFieldProviderBead
Posted by ha...@apache.org.
FLEX-35328 - Change IDataFieldProviderModel to bead DataFieldProviderBead
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/eaa33ea5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/eaa33ea5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/eaa33ea5
Branch: refs/heads/tlf
Commit: eaa33ea5b77b936d2b137978aabb6871424d63e0
Parents: 141b10b
Author: piotrz <pi...@apache.org>
Authored: Sun Jun 25 19:24:37 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Sun Jun 25 19:24:37 2017 +0200
----------------------------------------------------------------------
.../Basic/src/main/flex/BasicClasses.as | 1 -
.../flex/html/beads/DataFieldProviderBead.as | 89 +++++++++++++++++++
.../DataItemRendererFactoryForArrayData.as | 9 +-
.../DataItemRendererFactoryForArrayList.as | 9 +-
.../html/beads/models/DataFieldProviderModel.as | 91 --------------------
.../Basic/src/main/resources/basic-manifest.xml | 1 +
.../projects/Core/src/main/flex/CoreClasses.as | 1 -
.../apache/flex/core/IDataFieldProviderModel.as | 47 ----------
8 files changed, 98 insertions(+), 150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eaa33ea5/frameworks/projects/Basic/src/main/flex/BasicClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/BasicClasses.as b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
index 7203474..6c44dc8 100644
--- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as
+++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
@@ -213,7 +213,6 @@ internal class BasicClasses
import org.apache.flex.svg.CompoundGraphic; CompoundGraphic;
import org.apache.flex.html.beads.models.DataProviderModel; DataProviderModel;
- import org.apache.flex.html.beads.models.DataFieldProviderModel; DataFieldProviderModel;
import org.apache.flex.html.beads.DataContainerView; DataContainerView;
COMPILE::SWF
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eaa33ea5/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataFieldProviderBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataFieldProviderBead.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataFieldProviderBead.as
new file mode 100644
index 0000000..4d5fd0a
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataFieldProviderBead.as
@@ -0,0 +1,89 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.html.beads
+{
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.EventDispatcher;
+ import org.apache.flex.core.IBead;
+
+ /**
+ * The DataFieldProviderBead class is a model that holds dataField used mostly
+ * in item renderers for retrieve some value from dataProvider items.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public class DataFieldProviderBead implements IBead
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function DataFieldProviderBead()
+ {
+ }
+
+ private var _strand:IStrand;
+
+ /**
+ * @copy org.apache.flex.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function set strand(value:IStrand):void
+ {
+ _strand = value;
+ }
+
+ private var _dataField:String = null;
+
+ /**
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function get dataField():String
+ {
+ return _dataField;
+ }
+
+ /**
+ * @private
+ */
+ public function set dataField(value:String):void
+ {
+ if (value != _dataField)
+ {
+ _dataField = value;
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eaa33ea5/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
index 36754da..377aed3 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
@@ -25,7 +25,6 @@ package org.apache.flex.html.beads
import org.apache.flex.core.IListPresentationModel;
import org.apache.flex.core.ISelectableItemRenderer;
import org.apache.flex.core.IDataProviderModel;
- import org.apache.flex.core.IDataFieldProviderModel;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
import org.apache.flex.core.SimpleCSSStyles;
@@ -73,7 +72,7 @@ package org.apache.flex.html.beads
}
protected var dataProviderModel:IDataProviderModel;
- protected var dataFieldProviderModel:IDataFieldProviderModel;
+ protected var dataFieldProvider:DataFieldProviderBead;
protected var labelField:String;
protected var dataField:String;
@@ -103,10 +102,10 @@ package org.apache.flex.html.beads
dataProviderModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
labelField = dataProviderModel.labelField;
- dataFieldProviderModel = _strand.getBeadByType(IDataFieldProviderModel) as IDataFieldProviderModel;
- if (dataFieldProviderModel)
+ dataFieldProvider = _strand.getBeadByType(DataFieldProviderBead) as DataFieldProviderBead;
+ if (dataFieldProvider)
{
- dataField = dataFieldProviderModel.dataField;
+ dataField = dataFieldProvider.dataField;
}
// if the host component inherits from DataContainerBase, the itemRendererClassFactory will
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eaa33ea5/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
index b55571b..63763f0 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
@@ -25,7 +25,6 @@ package org.apache.flex.html.beads
import org.apache.flex.core.IItemRendererParent;
import org.apache.flex.core.IListPresentationModel;
import org.apache.flex.core.ISelectableItemRenderer;
- import org.apache.flex.core.IDataFieldProviderModel;
import org.apache.flex.core.IDataProviderModel;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
@@ -71,7 +70,7 @@ package org.apache.flex.html.beads
}
protected var dataProviderModel:IDataProviderModel;
- protected var dataFieldProviderModel:IDataFieldProviderModel;
+ protected var dataFieldProvider:DataFieldProviderBead;
protected var labelField:String;
protected var dataField:String;
@@ -98,10 +97,10 @@ package org.apache.flex.html.beads
dataProviderModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
labelField = dataProviderModel.labelField;
- dataFieldProviderModel = _strand.getBeadByType(IDataFieldProviderModel) as IDataFieldProviderModel;
- if (dataFieldProviderModel)
+ dataFieldProvider = _strand.getBeadByType(DataFieldProviderBead) as DataFieldProviderBead;
+ if (dataFieldProvider)
{
- dataField = dataFieldProviderModel.dataField;
+ dataField = dataFieldProvider.dataField;
}
// if the host component inherits from DataContainerBase, the itemRendererClassFactory will
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eaa33ea5/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/DataFieldProviderModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/DataFieldProviderModel.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/DataFieldProviderModel.as
deleted file mode 100644
index 8a33273..0000000
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/DataFieldProviderModel.as
+++ /dev/null
@@ -1,91 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.beads.models
-{
- import org.apache.flex.core.IDataFieldProviderModel;
- import org.apache.flex.core.IStrand;
- import org.apache.flex.events.Event;
- import org.apache.flex.events.EventDispatcher;
-
- /**
- * The DataFieldProviderModel class is a model that holds dataField used mostly
- * in item renderers for retrieve some value from dataProvider items.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.9
- */
- public class DataFieldProviderModel extends EventDispatcher implements IDataFieldProviderModel
- {
- /**
- * Constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.9
- */
- public function DataFieldProviderModel()
- {
- }
-
- private var _strand:IStrand;
-
- /**
- * @copy org.apache.flex.core.IBead#strand
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.9
- */
- public function set strand(value:IStrand):void
- {
- _strand = value;
- }
-
- private var _dataField:String = null;
-
- /**
- * @copy org.apache.flex.core.IDataFieldProviderModel#dataField
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.9
- */
- public function get dataField():String
- {
- return _dataField;
- }
-
- /**
- * @private
- */
- public function set dataField(value:String):void
- {
- if (value != _dataField)
- {
- _dataField = value;
- dispatchEvent(new Event("labelFieldChanged"));
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eaa33ea5/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index 4bc09fa..f44cef3 100644
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@ -96,6 +96,7 @@
<component id="DateItemRenderer" class="org.apache.flex.html.supportClasses.DateItemRenderer"/>
<component id="DayNameItemRenderer" class="org.apache.flex.html.supportClasses.DayNameItemRenderer"/>
<component id="TextButtonItemRenderer" class="org.apache.flex.html.supportClasses.TextButtonItemRenderer"/>
+ <component id="DataFieldProviderBead" class="org.apache.flex.html.beads.DataFieldProviderBead"/>
<!--
<component id="TextFieldItemRenderer" class="org.apache.flex.html.supportClasses.TextFieldItemRenderer"/>
<component id="HScrollBar" class="org.apache.flex.html.supportClasses.HScrollBar"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eaa33ea5/frameworks/projects/Core/src/main/flex/CoreClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/CoreClasses.as b/frameworks/projects/Core/src/main/flex/CoreClasses.as
index 2ac3b49..11b8b8b 100644
--- a/frameworks/projects/Core/src/main/flex/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/flex/CoreClasses.as
@@ -96,7 +96,6 @@ internal class CoreClasses
}
import org.apache.flex.core.ISelectableItemRenderer; ISelectableItemRenderer;
import org.apache.flex.core.ISelectionModel; ISelectionModel;
- import org.apache.flex.core.IDataFieldProviderModel; IDataFieldProviderModel;
import org.apache.flex.core.IStrand; IStrand;
import org.apache.flex.core.IStrandPrivate; IStrandPrivate;
import org.apache.flex.core.IStrandWithModel; IStrandWithModel;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eaa33ea5/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IDataFieldProviderModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IDataFieldProviderModel.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IDataFieldProviderModel.as
deleted file mode 100644
index deed144..0000000
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IDataFieldProviderModel.as
+++ /dev/null
@@ -1,47 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.core
-{
- import org.apache.flex.events.IEventDispatcher;
-
- /**
- * The IDataFieldProviderModel interface describes the minimum set of properties
- * available to control that let the user choose "dataField" from within a
- * set of items in a dataProvider.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.9
- */
- public interface IDataFieldProviderModel extends IEventDispatcher, IBeadModel
- {
- /**
- * The property on the data item that the item renderer
- * should renderer.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.9
- */
- function get dataField():String;
- function set dataField(value:String):void;
- }
-}
[03/29] git commit: [flex-asjs] [refs/heads/tlf] - Fix build - missed
artifacts version
Posted by ha...@apache.org.
Fix build - missed artifacts version
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fa45b0ea
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fa45b0ea
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fa45b0ea
Branch: refs/heads/tlf
Commit: fa45b0ea8419c57463c2d3be6124d3b22cbb0afc
Parents: c4ee975
Author: piotrz <pi...@apache.org>
Authored: Fri Jun 23 08:16:48 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Fri Jun 23 08:16:48 2017 +0200
----------------------------------------------------------------------
examples/express/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fa45b0ea/examples/express/pom.xml
----------------------------------------------------------------------
diff --git a/examples/express/pom.xml b/examples/express/pom.xml
index 08904b4..45288d2 100644
--- a/examples/express/pom.xml
+++ b/examples/express/pom.xml
@@ -71,14 +71,14 @@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Effects</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
<classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Effects</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
</dependency>
[08/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 - Add
ability to programmatic selection in MDL DropDownList
Posted by ha...@apache.org.
FLEX-35328 - Add ability to programmatic selection in MDL DropDownList
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4b6de169
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4b6de169
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4b6de169
Branch: refs/heads/tlf
Commit: 4b6de1691e02e2226deb5af4b81909907fff8bc1
Parents: f74836d
Author: piotrz <pi...@apache.org>
Authored: Sat Jun 24 16:24:56 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Sat Jun 24 16:24:56 2017 +0200
----------------------------------------------------------------------
.../beads/controllers/DropDownListController.as | 12 +++--
.../flex/mdl/beads/views/DropDownListView.as | 47 +++++++++++++++++++-
2 files changed, 53 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b6de169/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
index ed1a90c..149be7d 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
@@ -83,10 +83,14 @@ package org.apache.flex.mdl.beads.controllers
COMPILE::JS
private function onSelectChanged(event:Event):void
{
- var eventTarget:Object = event.target;
-
- model.selectedIndex = eventTarget.selectedIndex;
- model.selectedItem = model.dataProvider[model.selectedIndex];
+ var eventTarget:Object = event.target;
+ var selectedIndex:int = eventTarget.selectedIndex - 1;
+
+ if (model.selectedIndex != selectedIndex)
+ {
+ model.selectedIndex = selectedIndex;
+ model.selectedItem = model.dataProvider[selectedIndex];
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b6de169/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as
index e3c1658..cad3e0d 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as
@@ -18,6 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mdl.beads.views
{
+ import org.apache.flex.core.ISelectionModel;
import org.apache.flex.core.IStrand;
import org.apache.flex.html.Option;
import org.apache.flex.html.Select;
@@ -27,8 +28,7 @@ package org.apache.flex.mdl.beads.views
/**
* The DropDownListView class creates the visual elements of the org.apache.flex.mdl.DropDownList
- * component. The job of the view bead is to put together the parts of the DropDownList such as the Label
- * control and material icon ARROW_DROP_DOWN to trigger the pop-up.
+ * component. The job of the view bead is to put together the parts of the DropDownList such as the Select and Label
*
* @viewbead
* @langversion 3.0
@@ -79,9 +79,39 @@ package org.apache.flex.mdl.beads.views
}
}
+ override protected function dataProviderChangeHandler(event:Event):void
+ {
+ super.dataProviderChangeHandler(event);
+
+ COMPILE::JS
+ {
+ setProgrammaticallyChangedSelection();
+ }
+ }
+
+ override protected function itemsCreatedHandler(event:org.apache.flex.events.Event):void
+ {
+ super.itemsCreatedHandler(event);
+
+ COMPILE::JS
+ {
+ setProgrammaticallyChangedSelection();
+ }
+ }
+
+ private function selectionChangeHandler(event:Event):void
+ {
+ COMPILE::JS
+ {
+ setProgrammaticallyChangedSelection();
+ }
+ }
+
override protected function handleInitComplete(event:Event):void
{
super.handleInitComplete(event);
+
+ dataModel.addEventListener("selectedIndexChanged", selectionChangeHandler);
COMPILE::JS
{
@@ -98,5 +128,18 @@ package org.apache.flex.mdl.beads.views
dropDownList.labelDisplay.htmlFor = name;
dropDownList.dropDown.element.name = name;
}
+
+ COMPILE::JS
+ private function setProgrammaticallyChangedSelection():void
+ {
+ var dropDownList:DropDownList = (_strand as DropDownList);
+ var selectedIndex:int = dropDownList.dropDown.element["selectedIndex"] - 1;
+ var model:ISelectionModel = dataModel as ISelectionModel;
+
+ if (model.selectedIndex > -1 && model.dataProvider && model.selectedIndex != selectedIndex)
+ {
+ dropDownList.dropDown.element["selectedIndex"] = model.selectedIndex + 1;
+ }
+ }
}
}
\ No newline at end of file
[15/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 - Add
to DropDownList ability to dynamic creation and fix problem with upgrading
Posted by ha...@apache.org.
FLEX-35328 - Add to DropDownList ability to dynamic creation and fix problem with upgrading
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e86286f5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e86286f5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e86286f5
Branch: refs/heads/tlf
Commit: e86286f5a81856b49790f19d5da8389f9ec7329e
Parents: f3e5cf8
Author: piotrz <pi...@apache.org>
Authored: Sun Jun 25 14:18:09 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Sun Jun 25 14:18:09 2017 +0200
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/mdl/DropDownList.as | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e86286f5/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
index fbb720a..dd4f35b 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
@@ -24,6 +24,7 @@ package org.apache.flex.mdl
import org.apache.flex.events.ItemAddedEvent;
import org.apache.flex.html.DataContainer;
import org.apache.flex.html.Select;
+ import org.apache.flex.mdl.beads.UpgradeElement;
COMPILE::JS
{
@@ -60,6 +61,10 @@ package org.apache.flex.mdl
public function DropDownList()
{
super();
+
+ className = "";
+
+ addBead(new UpgradeElement());
}
private var _prompt:String = "";
[28/29] git commit: [flex-asjs] [refs/heads/tlf] - Added missing
projects.
Posted by ha...@apache.org.
Added missing projects.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/262bca15
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/262bca15
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/262bca15
Branch: refs/heads/tlf
Commit: 262bca15108044f76e85bb3d1bd281bfc6b696f5
Parents: 0636f57
Author: Peter Ent <pe...@apache.org>
Authored: Fri Jun 30 14:10:51 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Fri Jun 30 14:10:51 2017 -0400
----------------------------------------------------------------------
examples/flexjs/ASDoc/src/main/config/asdoc-config.xml | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/262bca15/examples/flexjs/ASDoc/src/main/config/asdoc-config.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/ASDoc/src/main/config/asdoc-config.xml b/examples/flexjs/ASDoc/src/main/config/asdoc-config.xml
index fe29e1c..30ed037 100644
--- a/examples/flexjs/ASDoc/src/main/config/asdoc-config.xml
+++ b/examples/flexjs/ASDoc/src/main/config/asdoc-config.xml
@@ -52,6 +52,7 @@
</source-path>
-->
<source-path>
+ <path-element>${frameworks_dir}/projects/Basic/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/Binding/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/Charts/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/Collections/src/main/flex</path-element>
@@ -59,6 +60,9 @@
<path-element>${frameworks_dir}/projects/CreateJS/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/DragDrop/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/Effects/src/main/flex</path-element>
+ <path-element>${frameworks_dir}/projects/Express/src/main/flex</path-element>
+ <path-element>${frameworks_dir}/projects/Flat/src/main/flex</path-element>
+ <path-element>${frameworks_dir}/projects/FontAwesome/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/Formatters/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/GoogleMaps/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/Graphics/src/main/flex</path-element>
@@ -67,9 +71,14 @@
<path-element>${frameworks_dir}/projects/HTML5/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/JQuery/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/Language/src/main/flex</path-element>
+ <path-element>${frameworks_dir}/projects/MaterialDesignLite/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/Mobile/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/Network/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/Reflection/src/main/flex</path-element>
+ <path-element>${frameworks_dir}/projects/Storage/src/main/flex</path-element>
+ <path-element>${frameworks_dir}/projects/TLF/src/main/flex</path-element>
+ <path-element>${frameworks_dir}/projects/Text/src/main/flex</path-element>
+ <path-element>${frameworks_dir}/projects/XML/src/main/flex</path-element>
</source-path>
<!-- Allow the source-path to have path-elements which contain other path-elements -->
[29/29] git commit: [flex-asjs] [refs/heads/tlf] - Merge branch
'develop' into tlf
Posted by ha...@apache.org.
Merge branch 'develop' into tlf
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b1d89fad
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b1d89fad
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b1d89fad
Branch: refs/heads/tlf
Commit: b1d89fadaa5a7c96bf5fcdee64b7f1c09c673eec
Parents: b32119f 262bca1
Author: Harbs <ha...@in-tools.com>
Authored: Mon Jul 3 16:32:29 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Jul 3 16:32:29 2017 +0300
----------------------------------------------------------------------
build.xml | 10 +
distribution/pom.xml | 13 +-
distribution/src/main/assembly/component.xml | 4 +-
.../ASDoc/src/main/config/asdoc-config.xml | 9 +
examples/flexjs/DesktopMap/DesktopMap-app.xml | 2 +-
.../main/resources/mdl-js-index-template.html | 4 +-
.../main/resources/mdl-js-index-template.html | 2 +-
.../MDLExample/src/main/flex/DropDownList.mxml | 42 +--
.../src/main/flex/models/MenuModel.as | 8 +-
.../MDLExample/src/main/flex/vos/MenuItemVO.as | 4 +-
.../main/resources/mdl-js-index-template.html | 2 +-
.../Basic/src/main/flex/BasicClasses.as | 2 +-
.../flex/html/beads/DataFieldProviderBead.as | 89 +++++++
.../DataItemRendererFactoryForArrayData.as | 24 +-
.../DataItemRendererFactoryForArrayList.as | 37 ++-
.../Basic/src/main/resources/basic-manifest.xml | 1 +
.../org/apache/flex/core/IDataProviderModel.as | 9 +-
.../org/apache/flex/core/SimpleCSSValuesImpl.as | 11 +-
.../main/flex/org/apache/flex/html/Option.as | 110 ++++++++
.../main/flex/org/apache/flex/html/Select.as | 69 +++++
.../HTML/src/main/resources/basic-manifest.xml | 4 +-
.../src/main/flex/MDLClasses.as | 1 +
.../flex/org/apache/flex/mdl/DropDownList.as | 153 ++++++++---
.../src/main/flex/org/apache/flex/mdl/List.as | 258 -------------------
.../beads/controllers/DropDownListController.as | 55 ++--
.../flex/mdl/beads/models/DropDownListModel.as | 64 +++++
.../flex/mdl/beads/models/IDropDownListModel.as | 43 ++++
.../flex/mdl/beads/views/DropDownListView.as | 121 +++++----
.../itemRenderers/DropDownListItemRenderer.as | 108 ++++++++
.../src/main/resources/defaults.css | 10 +-
.../src/main/resources/mdl-manifest.xml | 2 +
nightly.properties | 2 +-
32 files changed, 818 insertions(+), 455 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b1d89fad/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b1d89fad/frameworks/projects/Basic/src/main/flex/BasicClasses.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b1d89fad/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b1d89fad/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
index 36198f6,16b42c6..740e6ab
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
@@@ -788,9 -795,11 +795,11 @@@ package org.apache.flex.cor
var value:* = styles[p];
if (value === undefined)
continue;
- if (typeof(value) === 'number') {
+ if (typeof(value) == 'number') {
if (colorStyles[p])
value = CSSUtils.attributeFromColor(value);
+ else if (numericStyles[p])
+ value = value.toString();
else
value = value.toString() + 'px';
}
[23/29] git commit: [flex-asjs] [refs/heads/tlf] - fix nightly
Posted by ha...@apache.org.
fix nightly
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/18992c5f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/18992c5f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/18992c5f
Branch: refs/heads/tlf
Commit: 18992c5fd2ba51fb036137fbc1192b6c67d41c72
Parents: 3c74bea
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jun 28 22:42:42 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jun 28 22:42:42 2017 -0700
----------------------------------------------------------------------
nightly.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/18992c5f/nightly.properties
----------------------------------------------------------------------
diff --git a/nightly.properties b/nightly.properties
index 5dc7065..ae1f260 100644
--- a/nightly.properties
+++ b/nightly.properties
@@ -22,7 +22,7 @@ nightly = true
# path to falconjx nightly
falcon.server.url = http://apacheflexbuild.cloudapp.net:8080
falcon.md5.server.url = http://apacheflexbuild.cloudapp.net:8080
-falcon.folder = job/flex-falcon%20release%20branch/lastSuccessfulBuild/artifact/out
+falcon.folder = job/flex-falcon/lastSuccessfulBuild/artifact/out
falcon.version = 0.9.0
# path to local build
# falcon.server.url = file://Users/xxx/git/flex/master
[17/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 -
Update MDL DropDownList in MDLExample to usage of DataFieldProviderModel
Posted by ha...@apache.org.
FLEX-35328 - Update MDL DropDownList in MDLExample to usage of DataFieldProviderModel
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/141b10bb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/141b10bb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/141b10bb
Branch: refs/heads/tlf
Commit: 141b10bb74cae04325bab759cb098ba5c2157394
Parents: 5eb141e
Author: piotrz <pi...@apache.org>
Authored: Sun Jun 25 18:18:03 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Sun Jun 25 18:18:03 2017 +0200
----------------------------------------------------------------------
examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml | 4 +++-
examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as | 8 ++++----
examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as | 4 +++-
3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/141b10bb/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml b/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
index e17af31..14d14fd 100644
--- a/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
@@ -20,7 +20,8 @@ limitations under the License.
<mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:mdl="library://ns.apache.org/flexjs/mdl"
- xmlns="http://www.w3.org/1999/xhtml" xmlns:models="models.*">
+ xmlns="http://www.w3.org/1999/xhtml" xmlns:models="models.*"
+ xmlns:models2="org.apache.flex.html.beads.models.*">
<mdl:beads>
<js:ContainerDataBinding />
@@ -37,6 +38,7 @@ limitations under the License.
sourceID="menuModel"
sourcePropertyName="menuItems"
destinationPropertyName="dataProvider" />
+ <models2:DataFieldProviderModel dataField="value"/>
</mdl:beads>
</mdl:DropDownList>
</mdl:GridCell>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/141b10bb/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as b/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
index bbae844..3cd0004 100644
--- a/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
+++ b/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
@@ -23,10 +23,10 @@ package models
public class MenuModel
{
private var _menuItems:Array = [
- new MenuItemVO("Some Action"),
- new MenuItemVO("Another Action", true),
- new MenuItemVO("More Action"),
- new MenuItemVO("Item Disabled", false, true)
+ new MenuItemVO("Some Action", "Some value"),
+ new MenuItemVO("Another Action", "Another value", true),
+ new MenuItemVO("More Action", "More value"),
+ new MenuItemVO("Item Disabled", "Disabled value", false, true)
];
public function get menuItems():Array
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/141b10bb/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as b/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
index 691b18f..4ae4b46 100644
--- a/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
+++ b/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
@@ -22,12 +22,14 @@ package vos
public class MenuItemVO
{
public var label:String;
+ public var value:String;
public var disabled:Boolean;
public var hasDivider:Boolean;
- public function MenuItemVO(label:String, hasDivider:Boolean = false, disabled:Boolean = false)
+ public function MenuItemVO(label:String, value:String = "", hasDivider:Boolean = false, disabled:Boolean = false)
{
this.label = label;
+ this.value = value;
this.hasDivider = hasDivider;
this.disabled = disabled;
}
[21/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 -
Introduce "selectedValue" property in DropDownList - gives convinient way to
get value of Option component
Posted by ha...@apache.org.
FLEX-35328 - Introduce "selectedValue" property in DropDownList - gives convinient way to get value of Option component
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a4b17326
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a4b17326
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a4b17326
Branch: refs/heads/tlf
Commit: a4b173261cd143fe588d609b8cb2946fa12a8401
Parents: 181082a
Author: piotrz <pi...@apache.org>
Authored: Mon Jun 26 22:52:58 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Mon Jun 26 22:52:58 2017 +0200
----------------------------------------------------------------------
.../src/main/flex/MDLClasses.as | 1 +
.../flex/org/apache/flex/mdl/DropDownList.as | 21 ++++++-
.../beads/controllers/DropDownListController.as | 10 +--
.../flex/mdl/beads/models/DropDownListModel.as | 64 ++++++++++++++++++++
.../flex/mdl/beads/models/IDropDownListModel.as | 43 +++++++++++++
.../src/main/resources/defaults.css | 2 +-
6 files changed, 135 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4b17326/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as b/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as
index aa4c17b..d9ac1ac 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as
@@ -34,6 +34,7 @@ package
import org.apache.flex.mdl.beads.models.ToastModel; ToastModel;
import org.apache.flex.mdl.beads.models.SnackbarModel; SnackbarModel;
import org.apache.flex.mdl.beads.models.SliderRangeModel; SliderRangeModel;
+ import org.apache.flex.mdl.beads.models.DropDownListModel; DropDownListModel;
import org.apache.flex.mdl.materialIcons.MaterialIconType; MaterialIconType;
import org.apache.flex.mdl.beads.UpgradeElement; UpgradeElement;
import org.apache.flex.mdl.beads.UpgradeChildren; UpgradeChildren;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4b17326/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
index dd4f35b..d2db22d 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
@@ -25,6 +25,7 @@ package org.apache.flex.mdl
import org.apache.flex.html.DataContainer;
import org.apache.flex.html.Select;
import org.apache.flex.mdl.beads.UpgradeElement;
+ import org.apache.flex.mdl.beads.models.IDropDownListModel;
COMPILE::JS
{
@@ -119,7 +120,25 @@ package org.apache.flex.mdl
_labelDisplay = value;
}
}
-
+
+ [Bindable("change")]
+ /**
+ * @copy org.apache.flex.core.IDropDownListModel#selectedValue
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function get selectedValue():String
+ {
+ return IDropDownListModel(model).selectedValue;
+ }
+ public function set selectedValue(value:String):void
+ {
+ IDropDownListModel(model).selectedValue = value;
+ }
+
[Bindable("change")]
/**
* @copy org.apache.flex.core.ISelectionModel#selectedIndex
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4b17326/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
index 149be7d..6c384d2 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
@@ -19,12 +19,13 @@
package org.apache.flex.mdl.beads.controllers
{
import org.apache.flex.core.IBeadController;
- import org.apache.flex.core.ISelectionModel;
import org.apache.flex.core.IStrand;
import org.apache.flex.mdl.DropDownList;
import org.apache.flex.events.Event;
+ import org.apache.flex.mdl.beads.models.DropDownListModel;
+ import org.apache.flex.mdl.beads.models.IDropDownListModel;
- /**
+ /**
* The DropDownListController class bead handles mouse events on the
* drop down list component parts and dispatches change event on behalf of the DropDownList
*
@@ -55,7 +56,7 @@ package org.apache.flex.mdl.beads.controllers
* @playerversion AIR 2.6
* @productversion FlexJS 0.8
*/
- protected var model:ISelectionModel;
+ protected var model:DropDownListModel;
protected var _strand:IStrand;
/**
@@ -72,7 +73,7 @@ package org.apache.flex.mdl.beads.controllers
var dropDownList:DropDownList = (value as DropDownList);
- model = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
+ model = _strand.getBeadByType(IDropDownListModel) as DropDownListModel;
COMPILE::JS
{
@@ -90,6 +91,7 @@ package org.apache.flex.mdl.beads.controllers
{
model.selectedIndex = selectedIndex;
model.selectedItem = model.dataProvider[selectedIndex];
+ model.selectedValue = eventTarget.value;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4b17326/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/DropDownListModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/DropDownListModel.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/DropDownListModel.as
new file mode 100644
index 0000000..631c03c
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/DropDownListModel.as
@@ -0,0 +1,64 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.mdl.beads.models
+{
+ import org.apache.flex.events.Event;
+ import org.apache.flex.html.beads.models.ArraySelectionModel;
+
+ /**
+ * The DropDownListModel class defines the data associated with an org.apache.flex.mdl.DropDownListModel
+ * component.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public class DropDownListModel extends ArraySelectionModel implements IDropDownListModel
+ {
+ public function DropDownListModel()
+ {
+ super();
+ }
+
+ private var _selectedValue:String = "";
+
+ /**
+ * @copy org.apache.flex.mdl.beads.models.IDropDownListModel#selectedValue
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function get selectedValue():String
+ {
+ return _selectedValue;
+ }
+
+ public function set selectedValue(value:String):void
+ {
+ if (_selectedValue != value)
+ {
+ _selectedValue = value;
+ dispatchEvent(new org.apache.flex.events.Event("selectedValueChanged"));
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4b17326/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/IDropDownListModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/IDropDownListModel.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/IDropDownListModel.as
new file mode 100644
index 0000000..4a5f6e5
--- /dev/null
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/IDropDownListModel.as
@@ -0,0 +1,43 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.mdl.beads.models
+{
+ /**
+ * The IDropDownListModel interface describes the minimum set of properties
+ * available to DropDownList control
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public interface IDropDownListModel
+ {
+ /**
+ * Gets selectedValue from Select in DropDownList
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ function get selectedValue():String;
+ function set selectedValue(value:String):void;
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4b17326/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
index 347c226..033ec2a 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
@@ -154,7 +154,7 @@ FooterLinkList
DropDownList
{
IBeadView: ClassReference("org.apache.flex.mdl.beads.views.DropDownListView");
- IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+ IBeadModel: ClassReference("org.apache.flex.mdl.beads.models.DropDownListModel");
IBeadLayout: ClassReference(null);
IBeadController: ClassReference("org.apache.flex.mdl.beads.controllers.DropDownListController");
IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
[16/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 -
Introduce IDataFieldProviderModel - bead which provides to control with item
renderers "dataField" for usage by these item renderers. You can find example
of usage in MDL DropDownList where
Posted by ha...@apache.org.
FLEX-35328 - Introduce IDataFieldProviderModel - bead which provides to control with item renderers "dataField" for usage by these item renderers. You can find example of usage in MDL DropDownList where provided dataField is used by "value" property in HTML tag option
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5eb141ec
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5eb141ec
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5eb141ec
Branch: refs/heads/tlf
Commit: 5eb141ecca627d806db661fca0d5629c804ef17c
Parents: e86286f
Author: piotrz <pi...@apache.org>
Authored: Sun Jun 25 18:10:01 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Sun Jun 25 18:10:01 2017 +0200
----------------------------------------------------------------------
.../Basic/src/main/flex/BasicClasses.as | 3 +-
.../DataItemRendererFactoryForArrayData.as | 25 +++++-
.../DataItemRendererFactoryForArrayList.as | 38 ++++++--
.../html/beads/models/DataFieldProviderModel.as | 91 ++++++++++++++++++++
.../projects/Core/src/main/flex/CoreClasses.as | 1 +
.../apache/flex/core/IDataFieldProviderModel.as | 47 ++++++++++
.../org/apache/flex/core/IDataProviderModel.as | 9 +-
7 files changed, 195 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5eb141ec/frameworks/projects/Basic/src/main/flex/BasicClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/BasicClasses.as b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
index fbf9a67..7203474 100644
--- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as
+++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
@@ -213,7 +213,8 @@ internal class BasicClasses
import org.apache.flex.svg.CompoundGraphic; CompoundGraphic;
import org.apache.flex.html.beads.models.DataProviderModel; DataProviderModel;
- import org.apache.flex.html.beads.DataContainerView; DataContainerView;
+ import org.apache.flex.html.beads.models.DataFieldProviderModel; DataFieldProviderModel;
+ import org.apache.flex.html.beads.DataContainerView; DataContainerView;
COMPILE::SWF
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5eb141ec/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
index bcd837b..36754da 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
@@ -25,6 +25,7 @@ package org.apache.flex.html.beads
import org.apache.flex.core.IListPresentationModel;
import org.apache.flex.core.ISelectableItemRenderer;
import org.apache.flex.core.IDataProviderModel;
+ import org.apache.flex.core.IDataFieldProviderModel;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
import org.apache.flex.core.SimpleCSSStyles;
@@ -40,8 +41,9 @@ package org.apache.flex.html.beads
import org.apache.flex.core.IChild;
import org.apache.flex.core.ILayoutHost;
import org.apache.flex.core.IParentIUIBase;
-
- [Event(name="itemRendererCreated",type="org.apache.flex.events.ItemRendererEvent")]
+ import org.apache.flex.html.supportClasses.DataItemRenderer;
+
+ [Event(name="itemRendererCreated",type="org.apache.flex.events.ItemRendererEvent")]
/**
* The DataItemRendererFactoryForArrayData class reads an
@@ -71,8 +73,10 @@ package org.apache.flex.html.beads
}
protected var dataProviderModel:IDataProviderModel;
-
+ protected var dataFieldProviderModel:IDataFieldProviderModel;
+
protected var labelField:String;
+ protected var dataField:String;
private var _strand:IStrand;
@@ -98,7 +102,13 @@ package org.apache.flex.html.beads
dataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel;
dataProviderModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
labelField = dataProviderModel.labelField;
-
+
+ dataFieldProviderModel = _strand.getBeadByType(IDataFieldProviderModel) as IDataFieldProviderModel;
+ if (dataFieldProviderModel)
+ {
+ dataField = dataFieldProviderModel.dataField;
+ }
+
// if the host component inherits from DataContainerBase, the itemRendererClassFactory will
// already have been loaded by DataContainerBase.addedToParent function.
_itemRendererFactory = _strand.getBeadByType(IItemRendererClassFactory) as IItemRendererClassFactory;
@@ -160,9 +170,16 @@ package org.apache.flex.html.beads
for (var i:int = 0; i < n; i++)
{
var ir:ISelectableItemRenderer = itemRendererFactory.createItemRenderer(dataGroup) as ISelectableItemRenderer;
+ var dataItemRenderer:DataItemRenderer = ir as DataItemRenderer;
+
dataGroup.addItemRenderer(ir);
ir.index = i;
ir.labelField = labelField;
+ if (dataItemRenderer)
+ {
+ dataItemRenderer.dataField = dataField;
+ }
+
if (presentationModel) {
var style:SimpleCSSStyles = new SimpleCSSStyles();
style.marginBottom = presentationModel.separatorThickness;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5eb141ec/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
index c35f07f..b55571b 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
@@ -25,6 +25,7 @@ package org.apache.flex.html.beads
import org.apache.flex.core.IItemRendererParent;
import org.apache.flex.core.IListPresentationModel;
import org.apache.flex.core.ISelectableItemRenderer;
+ import org.apache.flex.core.IDataFieldProviderModel;
import org.apache.flex.core.IDataProviderModel;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
@@ -35,7 +36,9 @@ package org.apache.flex.html.beads
import org.apache.flex.events.IEventDispatcher;
import org.apache.flex.events.EventDispatcher;
import org.apache.flex.events.ItemRendererEvent;
- //import org.apache.flex.html.List;
+ import org.apache.flex.html.supportClasses.DataItemRenderer;
+
+ //import org.apache.flex.html.List;
import org.apache.flex.core.IList;
[Event(name="itemRendererCreated",type="org.apache.flex.events.ItemRendererEvent")]
@@ -68,9 +71,11 @@ package org.apache.flex.html.beads
}
protected var dataProviderModel:IDataProviderModel;
-
+ protected var dataFieldProviderModel:IDataFieldProviderModel;
+
protected var labelField:String;
-
+ protected var dataField:String;
+
private var _strand:IStrand;
/**
@@ -92,7 +97,13 @@ package org.apache.flex.html.beads
dataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel;
dataProviderModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
labelField = dataProviderModel.labelField;
-
+
+ dataFieldProviderModel = _strand.getBeadByType(IDataFieldProviderModel) as IDataFieldProviderModel;
+ if (dataFieldProviderModel)
+ {
+ dataField = dataFieldProviderModel.dataField;
+ }
+
// if the host component inherits from DataContainerBase, the itemRendererClassFactory will
// already have been loaded by DataContainerBase.addedToParent function.
_itemRendererFactory = _strand.getBeadByType(IItemRendererClassFactory) as IItemRendererClassFactory;
@@ -133,9 +144,7 @@ package org.apache.flex.html.beads
*/
protected function setData(ir:ISelectableItemRenderer, data:Object, index:int):void
{
- ir.index = index;
- ir.labelField = labelField;
- ir.data = data;
+
}
/**
@@ -158,6 +167,8 @@ package org.apache.flex.html.beads
for (var i:int = 0; i < n; i++)
{
var ir:ISelectableItemRenderer = itemRendererFactory.createItemRenderer(dataGroup) as ISelectableItemRenderer;
+ var dataItemRenderer:DataItemRenderer = ir as DataItemRenderer;
+
dataGroup.addItemRenderer(ir);
if (presentationModel) {
var style:SimpleCSSStyles = new SimpleCSSStyles();
@@ -166,8 +177,17 @@ package org.apache.flex.html.beads
UIBase(ir).height = presentationModel.rowHeight;
UIBase(ir).percentWidth = 100;
}
- setData(ir, dp.getItemAt(i), i);
-
+
+ var data:Object = dp.getItemAt(i);
+ ir.index = i;
+ ir.labelField = labelField;
+ if (dataItemRenderer)
+ {
+ dataItemRenderer.dataField = dataField;
+ }
+
+ ir.data = data;
+
var newEvent:ItemRendererEvent = new ItemRendererEvent(ItemRendererEvent.CREATED);
newEvent.itemRenderer = ir;
dispatchEvent(newEvent);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5eb141ec/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/DataFieldProviderModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/DataFieldProviderModel.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/DataFieldProviderModel.as
new file mode 100644
index 0000000..8a33273
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/DataFieldProviderModel.as
@@ -0,0 +1,91 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.html.beads.models
+{
+ import org.apache.flex.core.IDataFieldProviderModel;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.EventDispatcher;
+
+ /**
+ * The DataFieldProviderModel class is a model that holds dataField used mostly
+ * in item renderers for retrieve some value from dataProvider items.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public class DataFieldProviderModel extends EventDispatcher implements IDataFieldProviderModel
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function DataFieldProviderModel()
+ {
+ }
+
+ private var _strand:IStrand;
+
+ /**
+ * @copy org.apache.flex.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function set strand(value:IStrand):void
+ {
+ _strand = value;
+ }
+
+ private var _dataField:String = null;
+
+ /**
+ * @copy org.apache.flex.core.IDataFieldProviderModel#dataField
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function get dataField():String
+ {
+ return _dataField;
+ }
+
+ /**
+ * @private
+ */
+ public function set dataField(value:String):void
+ {
+ if (value != _dataField)
+ {
+ _dataField = value;
+ dispatchEvent(new Event("labelFieldChanged"));
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5eb141ec/frameworks/projects/Core/src/main/flex/CoreClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/CoreClasses.as b/frameworks/projects/Core/src/main/flex/CoreClasses.as
index 11b8b8b..2ac3b49 100644
--- a/frameworks/projects/Core/src/main/flex/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/flex/CoreClasses.as
@@ -96,6 +96,7 @@ internal class CoreClasses
}
import org.apache.flex.core.ISelectableItemRenderer; ISelectableItemRenderer;
import org.apache.flex.core.ISelectionModel; ISelectionModel;
+ import org.apache.flex.core.IDataFieldProviderModel; IDataFieldProviderModel;
import org.apache.flex.core.IStrand; IStrand;
import org.apache.flex.core.IStrandPrivate; IStrandPrivate;
import org.apache.flex.core.IStrandWithModel; IStrandWithModel;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5eb141ec/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IDataFieldProviderModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IDataFieldProviderModel.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IDataFieldProviderModel.as
new file mode 100644
index 0000000..deed144
--- /dev/null
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IDataFieldProviderModel.as
@@ -0,0 +1,47 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.core
+{
+ import org.apache.flex.events.IEventDispatcher;
+
+ /**
+ * The IDataFieldProviderModel interface describes the minimum set of properties
+ * available to control that let the user choose "dataField" from within a
+ * set of items in a dataProvider.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public interface IDataFieldProviderModel extends IEventDispatcher, IBeadModel
+ {
+ /**
+ * The property on the data item that the item renderer
+ * should renderer.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ function get dataField():String;
+ function set dataField(value:String):void;
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5eb141ec/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IDataProviderModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IDataProviderModel.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IDataProviderModel.as
index 8e154f9..3e5df9d 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IDataProviderModel.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IDataProviderModel.as
@@ -21,11 +21,10 @@ package org.apache.flex.core
import org.apache.flex.events.IEventDispatcher;
/**
- * The ISelectionModel interface describes the minimum set of properties
- * available to control that let the user select from within a
- * set of items in a dataProvider. A more sophisticated model would
- * support multiple selection.
- *
+ * The IDataProviderModel interface describes the minimum set of properties
+ * available to control that let the user choose within a
+ * set of items in a dataProvider.
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
[20/29] git commit: [flex-asjs] [refs/heads/tlf] - Merge branch
'develop' into feature/FLEX-35328_simplify_mdl_drop_down_list
Posted by ha...@apache.org.
Merge branch 'develop' into feature/FLEX-35328_simplify_mdl_drop_down_list
# Conflicts:
# distribution/pom.xml
# distribution/src/main/assembly/component.xml
# examples/express/DataBindingExample/pom.xml
# examples/flexjs/TeamPage/pom.xml
# frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/181082a8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/181082a8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/181082a8
Branch: refs/heads/tlf
Commit: 181082a8ab7951fd8a0e1cab05da4c0c0bc49c01
Parents: c706278 9929255
Author: piotrz <pi...@apache.org>
Authored: Mon Jun 26 21:50:08 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Mon Jun 26 21:50:08 2017 +0200
----------------------------------------------------------------------
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
build.properties | 2 +-
examples/express/DataBindingExample/pom.xml | 2 +-
examples/flexjs/FlexTeamPage_MDL/pom.xml | 2 +-
examples/flexjs/MDLBlogExample/pom.xml | 2 +-
examples/flexjs/MDLDynamicTabsExample/pom.xml | 2 +-
examples/flexjs/MDLExample/pom.xml | 2 +-
examples/flexjs/TeamPage/pom.xml | 10 +---------
.../flex/org/apache/flex/core/SimpleCSSValuesImpl.as | 12 ++++++------
pom.xml | 2 +-
releasecandidate.xml | 7 ++++---
13 files changed, 21 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
[05/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 - Use
Select and Option in MDL DropDownList from HTML module
Posted by ha...@apache.org.
FLEX-35328 - Use Select and Option in MDL DropDownList from HTML module
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ec944a7a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ec944a7a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ec944a7a
Branch: refs/heads/tlf
Commit: ec944a7a90fbcd2b17f055488413a739abfbfbcf
Parents: 486a243
Author: piotrz <pi...@apache.org>
Authored: Fri Jun 23 08:52:06 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Fri Jun 23 08:52:06 2017 +0200
----------------------------------------------------------------------
.../flex/org/apache/flex/mdl/DropDownList.as | 44 ++++++-------
.../beads/controllers/DropDownListController.as | 5 +-
.../flex/mdl/beads/views/DropDownListView.as | 18 +++---
.../itemRenderers/DropDownListItemRenderer.as | 65 +++-----------------
4 files changed, 38 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ec944a7a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
index 8b2c430..2dddaf3 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
@@ -20,8 +20,11 @@ package org.apache.flex.mdl
{
import org.apache.flex.core.IItemRenderer;
import org.apache.flex.core.ISelectionModel;
+ import org.apache.flex.core.UIBase;
import org.apache.flex.events.ItemAddedEvent;
import org.apache.flex.html.DataContainer;
+ import org.apache.flex.html.Option;
+ import org.apache.flex.html.Select;
COMPILE::JS
{
@@ -60,28 +63,21 @@ package org.apache.flex.mdl
super();
}
- COMPILE::JS
- protected var _labelDisplay:HTMLLabelElement;
- COMPILE::JS
- protected var _dropDown:HTMLSelectElement;
+ protected var _dropDown:Select;
- COMPILE::JS
+ public function get dropDown():Select
{
- /**
- * @flexjsignorecoercion HTMLSelectElement
- */
- public function get dropDown():HTMLSelectElement
- {
- return _dropDown;
- }
+ return _dropDown;
+ }
- /**
- * @flexjsignorecoercion HTMLSelectElement
- */
- public function set dropDown(value:HTMLSelectElement):void
- {
- _dropDown = value;
- }
+ public function set dropDown(value:Select):void
+ {
+ _dropDown = value;
+ }
+
+ COMPILE::JS
+ {
+ protected var _labelDisplay:HTMLLabelElement;
/**
* @flexjsignorecoercion HTMLLabelElement
@@ -140,12 +136,12 @@ package org.apache.flex.mdl
{
COMPILE::JS
{
- var options:HTMLOptionsCollection = dropDown.options;
- var optionsCount:int = options.length;
-
+ var optionsCount:int = dropDown.numElements;
+
for (var i:int = 1; i < optionsCount; i++)
{
- dropDown.remove(i);
+ var item:UIBase = dropDown.getElementAt(i) as UIBase;
+ dropDown.removeElement(item);
}
}
}
@@ -154,7 +150,7 @@ package org.apache.flex.mdl
{
COMPILE::JS
{
- dropDown.appendChild(renderer.element);
+ dropDown.addElement(renderer);
}
var newEvent:ItemAddedEvent = new ItemAddedEvent("itemAdded");
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ec944a7a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
index 53c37ef..bd9bf3b 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
@@ -23,7 +23,6 @@ package org.apache.flex.mdl.beads.controllers
import org.apache.flex.core.IStrand;
import org.apache.flex.events.IEventDispatcher;
import org.apache.flex.mdl.DropDownList;
- import org.apache.flex.mdl.beads.views.DropDownListView;
import org.apache.flex.events.Event;
/**
@@ -58,8 +57,6 @@ package org.apache.flex.mdl.beads.controllers
* @productversion FlexJS 0.8
*/
protected var model:ISelectionModel;
- protected var dropDownListView:DropDownListView;
-
protected var _strand:IStrand;
/**
@@ -80,7 +77,7 @@ package org.apache.flex.mdl.beads.controllers
COMPILE::JS
{
- dropDownList.dropDown.addEventListener("onchange", onDisplayItemClick, false);
+ dropDownList.dropDown.element.addEventListener("onchange", onDisplayItemClick, false);
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ec944a7a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as
index 51960d6..e3c1658 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as
@@ -19,6 +19,8 @@
package org.apache.flex.mdl.beads.views
{
import org.apache.flex.core.IStrand;
+ import org.apache.flex.html.Option;
+ import org.apache.flex.html.Select;
import org.apache.flex.html.beads.DataContainerView;
import org.apache.flex.mdl.DropDownList;
import org.apache.flex.events.Event;
@@ -45,8 +47,6 @@ package org.apache.flex.mdl.beads.views
* @copy org.apache.flex.core.IBead#strand
*
* @flexjsignorecoercion HTMLLabelElement
- * @flexjsignorecoercion HTMLSelectElement
- * @flexjsignorecoercion HTMLOptionElement
*
* @langversion 3.0
* @playerversion Flash 10.2
@@ -64,18 +64,18 @@ package org.apache.flex.mdl.beads.views
dropDownList.labelDisplay = document.createElement('label') as HTMLLabelElement;
dropDownList.labelDisplay.classList.add("mdl-textfield__label");
- dropDownList.dropDown = document.createElement('select') as HTMLSelectElement;
- dropDownList.dropDown.classList.add("mdl-textfield__input");
+ dropDownList.dropDown = new Select();
+ dropDownList.dropDown.element.classList.add("mdl-textfield__input");
- var emptyOption:HTMLOptionElement = document.createElement('option') as HTMLOptionElement;
- emptyOption.style.display = "none";
+ var emptyOption:Option = new Option();
+ emptyOption.element.style.display = "none";
- dropDownList.dropDown.appendChild(emptyOption);
+ dropDownList.dropDown.addElement(emptyOption);
setNameForDropDownList();
dropDownList.element.appendChild(dropDownList.labelDisplay);
- dropDownList.element.appendChild(dropDownList.dropDown);
+ dropDownList.addElement(dropDownList.dropDown);
}
}
@@ -96,7 +96,7 @@ package org.apache.flex.mdl.beads.views
var name:String = "dropDownList" + Math.random();
dropDownList.labelDisplay.htmlFor = name;
- dropDownList.dropDown.name = name;
+ dropDownList.dropDown.element.name = name;
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ec944a7a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/DropDownListItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/DropDownListItemRenderer.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/DropDownListItemRenderer.as
index 65e13e1..d8ba333 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/DropDownListItemRenderer.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/DropDownListItemRenderer.as
@@ -18,6 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mdl.itemRenderers
{
+ import org.apache.flex.html.Option;
import org.apache.flex.html.supportClasses.MXMLItemRenderer;
COMPILE::JS
@@ -49,46 +50,8 @@ package org.apache.flex.mdl.itemRenderers
className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
}
-
- private var _text:String = "";
- /**
- * The text of the menu item
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public function get text():String
- {
- COMPILE::SWF
- {
- return _text;
- }
- COMPILE::JS
- {
- return textNode.nodeValue;
- }
- }
-
- public function set text(value:String):void
- {
- COMPILE::SWF
- {
- _text = value;
- }
- COMPILE::JS
- {
- textNode.nodeValue = value;
- }
- }
-
- COMPILE::JS
- private var textNode:Text;
-
- COMPILE::JS
- private var item:HTMLOptionElement;
+ private var item:Option;
/**
* Sets the data value and uses the String version of the data for display.
@@ -104,49 +67,37 @@ package org.apache.flex.mdl.itemRenderers
{
super.data = value;
- var text:String;
if (labelField)
{
- text = String(value[labelField]);
+ item.text = String(value[labelField]);
}
else
{
- text = String(value);
+ item.text = String(value);
}
COMPILE::JS
{
if (dataField)
{
- item.value = String(value[dataField]);
+ item.element["value"] = String(value[dataField]);
}
else
{
- item.value = String(value);
- }
-
- if(textNode != null)
- {
- textNode.nodeValue = text;
+ item.element["value"] = String(value);
}
}
}
/**
* @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
- * @flexjsignorecoercion HTMLOptionElement
- *
- * @flexjsignorecoercion Text
*/
COMPILE::JS
override protected function createElement():WrappedHTMLElement
{
- item = document.createElement('option') as HTMLOptionElement;
-
- textNode = document.createTextNode('') as Text;
- item.appendChild(textNode);
+ item = new Option();
- element = item as WrappedHTMLElement;
+ element = item.element as WrappedHTMLElement;
positioner = element;
element.flexjs_wrapper = this;
[22/29] git commit: [flex-asjs] [refs/heads/tlf] - make non-debug
output
Posted by ha...@apache.org.
make non-debug output
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3c74bea5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3c74bea5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3c74bea5
Branch: refs/heads/tlf
Commit: 3c74bea58f822ce7283d6c4286ad4d18c84810a3
Parents: 911cf92
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jun 28 22:39:40 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jun 28 22:39:40 2017 -0700
----------------------------------------------------------------------
build.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3c74bea5/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4eb2bbb..2d344f5 100644
--- a/build.xml
+++ b/build.xml
@@ -1918,6 +1918,16 @@
</mxmlc>
</target>
+ <target name="compile-release" depends="check-flex-home,check-falcon-home,check-falconjx-home,check-goog-home,load-task" description="compile for SWF">
+
+ <property name="FLEX_HOME" value="${basedir}" />
+ <mxmlc fork="true" debug="false"
+ file="${file}">
+ <jvmarg line="${mxmlc.jvm.args}"/>
+ <arg value="-closure-lib=${GOOG_HOME}" />
+ </mxmlc>
+ </target>
+
<target name="compile-js" depends="check-flex-home,check-falcon-home,check-falconjx-home,check-goog-home" description="compile for JS">
<property name="FLEX_HOME" value="${basedir}" />
<java jar="${FALCONJX_HOME}/lib/mxmlc.jar"
[09/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 -
Adjust MDLExample layout in DropDownList tab
Posted by ha...@apache.org.
FLEX-35328 - Adjust MDLExample layout in DropDownList tab
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2fc506e6
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2fc506e6
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2fc506e6
Branch: refs/heads/tlf
Commit: 2fc506e626afc39b1cef546714d151a4f3463633
Parents: 4b6de16
Author: piotrz <pi...@apache.org>
Authored: Sat Jun 24 16:42:29 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Sat Jun 24 16:42:29 2017 +0200
----------------------------------------------------------------------
.../MDLExample/src/main/flex/DropDownList.mxml | 32 ++++++++++++--------
1 file changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2fc506e6/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml b/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
index 72aa9e9..a50413a 100644
--- a/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
@@ -28,18 +28,26 @@ limitations under the License.
<mdl:model>
<models:MenuModel id="menuModel"/>
</mdl:model>
- <mdl:Grid width="100">
- <mdl:DropDownList id="dropDownList" labelField="label" width="150" change="onDplChange(event)">
- <mdl:beads>
- <js:ConstantBinding
- sourceID="menuModel"
- sourcePropertyName="menuItems"
- destinationPropertyName="dataProvider" />
- </mdl:beads>
- </mdl:DropDownList>
- <js:Label text="Selected index: {dropDownList.selectedIndex}"/>
- <js:Label id="selectedItemChange"
- text="Selected item on 'change' event: "/>
+ <mdl:Grid>
+ <mdl:GridCell columnDesktop="12">
+ <mdl:DropDownList id="dropDownList" labelField="label" width="150"
+ selectedIndex="0"
+ change="onDplChange(event)">
+ <mdl:beads>
+ <js:ConstantBinding
+ sourceID="menuModel"
+ sourcePropertyName="menuItems"
+ destinationPropertyName="dataProvider" />
+ </mdl:beads>
+ </mdl:DropDownList>
+ </mdl:GridCell>
+ <mdl:GridCell columnDesktop="12">
+ <js:Label text="Selected index: {dropDownList.selectedIndex}"/>
+ </mdl:GridCell>
+ <mdl:GridCell columnDesktop="12">
+ <js:Label id="selectedItemChange"
+ text="Selected item on 'change' event: "/>
+ </mdl:GridCell>
</mdl:Grid>
<fx:Script><![CDATA[
public function onDplChange(event:Event):void
[26/29] git commit: [flex-asjs] [refs/heads/tlf] - Merge branch
'feature/FLEX-35328_simplify_mdl_drop_down_list' into develop
Posted by ha...@apache.org.
Merge branch 'feature/FLEX-35328_simplify_mdl_drop_down_list' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f4d28a6d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f4d28a6d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f4d28a6d
Branch: refs/heads/tlf
Commit: f4d28a6d8f311b3be379f282fb175e4e938e079c
Parents: 68f118b 1db1de0
Author: piotrz <pi...@apache.org>
Authored: Thu Jun 29 21:12:52 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Thu Jun 29 21:12:52 2017 +0200
----------------------------------------------------------------------
distribution/pom.xml | 13 +-
distribution/src/main/assembly/component.xml | 4 +-
examples/flexjs/DesktopMap/DesktopMap-app.xml | 2 +-
.../main/resources/mdl-js-index-template.html | 4 +-
.../main/resources/mdl-js-index-template.html | 2 +-
.../MDLExample/src/main/flex/DropDownList.mxml | 36 ++-
.../src/main/flex/models/MenuModel.as | 8 +-
.../MDLExample/src/main/flex/vos/MenuItemVO.as | 4 +-
.../main/resources/mdl-js-index-template.html | 2 +-
.../Basic/src/main/flex/BasicClasses.as | 2 +-
.../flex/html/beads/DataFieldProviderBead.as | 89 +++++++
.../DataItemRendererFactoryForArrayData.as | 24 +-
.../DataItemRendererFactoryForArrayList.as | 37 ++-
.../Basic/src/main/resources/basic-manifest.xml | 1 +
.../org/apache/flex/core/IDataProviderModel.as | 9 +-
.../main/flex/org/apache/flex/html/Option.as | 110 ++++++++
.../main/flex/org/apache/flex/html/Select.as | 69 +++++
.../HTML/src/main/resources/basic-manifest.xml | 4 +-
.../src/main/flex/MDLClasses.as | 1 +
.../flex/org/apache/flex/mdl/DropDownList.as | 153 ++++++++---
.../src/main/flex/org/apache/flex/mdl/List.as | 258 -------------------
.../beads/controllers/DropDownListController.as | 55 ++--
.../flex/mdl/beads/models/DropDownListModel.as | 64 +++++
.../flex/mdl/beads/models/IDropDownListModel.as | 43 ++++
.../flex/mdl/beads/views/DropDownListView.as | 121 +++++----
.../itemRenderers/DropDownListItemRenderer.as | 108 ++++++++
.../src/main/resources/defaults.css | 10 +-
.../src/main/resources/mdl-manifest.xml | 2 +
28 files changed, 783 insertions(+), 452 deletions(-)
----------------------------------------------------------------------
[19/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 -
Update MDLExample with DataFieldProviderBead
Posted by ha...@apache.org.
FLEX-35328 - Update MDLExample with DataFieldProviderBead
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c706278e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c706278e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c706278e
Branch: refs/heads/tlf
Commit: c706278ed1fe5d7ab5e763c572b3d97f16077a80
Parents: eaa33ea
Author: piotrz <pi...@apache.org>
Authored: Sun Jun 25 19:27:09 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Sun Jun 25 19:27:09 2017 +0200
----------------------------------------------------------------------
examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c706278e/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml b/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
index 14d14fd..4231328 100644
--- a/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
@@ -38,7 +38,7 @@ limitations under the License.
sourceID="menuModel"
sourcePropertyName="menuItems"
destinationPropertyName="dataProvider" />
- <models2:DataFieldProviderModel dataField="value"/>
+ <js:DataFieldProviderBead dataField="value"/>
</mdl:beads>
</mdl:DropDownList>
</mdl:GridCell>
[07/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 - Make
"change" event working for DropDownList
Posted by ha...@apache.org.
FLEX-35328 - Make "change" event working for DropDownList
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f74836d4
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f74836d4
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f74836d4
Branch: refs/heads/tlf
Commit: f74836d4f5016c550f34fac7cd9c8dc17dced31d
Parents: 0c7da1b
Author: piotrz <pi...@apache.org>
Authored: Sat Jun 24 14:39:57 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Sat Jun 24 14:39:57 2017 +0200
----------------------------------------------------------------------
.../flex/mdl/beads/controllers/DropDownListController.as | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f74836d4/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
index bd9bf3b..ed1a90c 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as
@@ -18,10 +18,9 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mdl.beads.controllers
{
- import org.apache.flex.core.IBeadController;
+ import org.apache.flex.core.IBeadController;
import org.apache.flex.core.ISelectionModel;
import org.apache.flex.core.IStrand;
- import org.apache.flex.events.IEventDispatcher;
import org.apache.flex.mdl.DropDownList;
import org.apache.flex.events.Event;
@@ -77,19 +76,17 @@ package org.apache.flex.mdl.beads.controllers
COMPILE::JS
{
- dropDownList.dropDown.element.addEventListener("onchange", onDisplayItemClick, false);
+ dropDownList.dropDown.element.addEventListener(Event.CHANGE, onSelectChanged, false);
}
}
COMPILE::JS
- private function onDisplayItemClick(event:Event):void
+ private function onSelectChanged(event:Event):void
{
var eventTarget:Object = event.target;
model.selectedIndex = eventTarget.selectedIndex;
model.selectedItem = model.dataProvider[model.selectedIndex];
-
- IEventDispatcher(_strand).dispatchEvent(new Event(Event.CHANGE));
}
}
}
[06/29] git commit: [flex-asjs] [refs/heads/tlf] - Fix build missed
artifacts version
Posted by ha...@apache.org.
Fix build missed artifacts version
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0c7da1b7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0c7da1b7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0c7da1b7
Branch: refs/heads/tlf
Commit: 0c7da1b74178848632794b611ac37de88dba96f1
Parents: ec944a7
Author: piotrz <pi...@apache.org>
Authored: Fri Jun 23 08:54:38 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Fri Jun 23 08:54:38 2017 +0200
----------------------------------------------------------------------
examples/flexjs/StorageExample/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0c7da1b7/examples/flexjs/StorageExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/StorageExample/pom.xml b/examples/flexjs/StorageExample/pom.xml
index 081cb7f..6cc957e 100644
--- a/examples/flexjs/StorageExample/pom.xml
+++ b/examples/flexjs/StorageExample/pom.xml
@@ -75,14 +75,14 @@
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Mobile</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
<classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Mobile</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
</dependency>
[14/29] git commit: [flex-asjs] [refs/heads/tlf] - Remove defer which
causes problems with MDL element upgrade
Posted by ha...@apache.org.
Remove defer which causes problems with MDL element upgrade
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f3e5cf85
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f3e5cf85
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f3e5cf85
Branch: refs/heads/tlf
Commit: f3e5cf85f81612450161b1846773c0bd6d22081a
Parents: 12ce065
Author: piotrz <pi...@apache.org>
Authored: Sun Jun 25 14:03:23 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Sun Jun 25 14:03:23 2017 +0200
----------------------------------------------------------------------
.../src/main/resources/mdl-js-index-template.html | 4 ++--
.../src/main/resources/mdl-js-index-template.html | 2 +-
.../MDLExample/src/main/resources/mdl-js-index-template.html | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f3e5cf85/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html b/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html
index 62cbf70..1e170ed 100644
--- a/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html
+++ b/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html
@@ -23,8 +23,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0"">
<link rel="stylesheet" type="text/css" href="${application}.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
- <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.${primary}-${accent}.min.css">
- <script defer src="https://code.getmdl.io/1.2.1/material.min.js"></script>
+ <link rel="stylesheet" href="https://code.getmdl.io/1.3.0/material.min.css">
+ <script src="https://code.getmdl.io/1.3.0/material.min.js"></script>
${head}
</head>
<body>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f3e5cf85/examples/flexjs/MDLDynamicTabsExample/src/main/resources/mdl-js-index-template.html
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLDynamicTabsExample/src/main/resources/mdl-js-index-template.html b/examples/flexjs/MDLDynamicTabsExample/src/main/resources/mdl-js-index-template.html
index 308fddf..1e170ed 100644
--- a/examples/flexjs/MDLDynamicTabsExample/src/main/resources/mdl-js-index-template.html
+++ b/examples/flexjs/MDLDynamicTabsExample/src/main/resources/mdl-js-index-template.html
@@ -24,7 +24,7 @@
<link rel="stylesheet" type="text/css" href="${application}.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://code.getmdl.io/1.3.0/material.min.css">
- <script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script>
+ <script src="https://code.getmdl.io/1.3.0/material.min.js"></script>
${head}
</head>
<body>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f3e5cf85/examples/flexjs/MDLExample/src/main/resources/mdl-js-index-template.html
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/resources/mdl-js-index-template.html b/examples/flexjs/MDLExample/src/main/resources/mdl-js-index-template.html
index 48ba116..f21943f 100644
--- a/examples/flexjs/MDLExample/src/main/resources/mdl-js-index-template.html
+++ b/examples/flexjs/MDLExample/src/main/resources/mdl-js-index-template.html
@@ -24,7 +24,7 @@
<link rel="stylesheet" type="text/css" href="${application}.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://code.getmdl.io/1.3.0/material.min.css">
- <script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script>
+ <script src="https://code.getmdl.io/1.3.0/material.min.js"></script>
${head}
</head>
<body>
[13/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 -
Initialize prompt with empty string to avoid displaying "undefined"
Posted by ha...@apache.org.
FLEX-35328 - Initialize prompt with empty string to avoid displaying "undefined"
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/12ce0655
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/12ce0655
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/12ce0655
Branch: refs/heads/tlf
Commit: 12ce0655ae7fdb8e602261ea9a1a054137a028f4
Parents: f3ea275
Author: piotrz <pi...@apache.org>
Authored: Sun Jun 25 13:26:41 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Sun Jun 25 13:26:41 2017 +0200
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/mdl/DropDownList.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/12ce0655/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
index 708b8ba..fbb720a 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
@@ -62,7 +62,7 @@ package org.apache.flex.mdl
super();
}
- private var _prompt:String;
+ private var _prompt:String = "";
/**
* The prompt for the DropDownList control.
[25/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 -
Update documentation
Posted by ha...@apache.org.
FLEX-35328 - Update documentation
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1db1de05
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1db1de05
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1db1de05
Branch: refs/heads/tlf
Commit: 1db1de0566c8b959c46a5ac0ce603acdb41e66f0
Parents: a4b1732
Author: piotrz <pi...@apache.org>
Authored: Thu Jun 29 21:12:28 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Thu Jun 29 21:12:28 2017 +0200
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/mdl/DropDownList.as | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1db1de05/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
index d2db22d..610f587 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
@@ -36,13 +36,8 @@ package org.apache.flex.mdl
/**
* The DropDownList class is a component that displays label field and
- * pop-up list (MDL Menu) with selections. Selecting an item from the pop-up list
- * places that item into the label field of the DropDownList. The DropDownList
- * uses the following bead types:
- *
- * org.apache.flex.core.IBeadModel: the data model, which includes the dataProvider, selectedItem, and
- * so forth.
- * org.apache.flex.core.IBeadView: the bead that constructs the visual parts of the component.
+ * Select with Options. Selecting an item from the pop-up list
+ * places that item into the label field of the DropDownList.
*
* @langversion 3.0
* @playerversion Flash 10.2
[12/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 - Fix
typo in mdl-manifest
Posted by ha...@apache.org.
FLEX-35328 - Fix typo in mdl-manifest
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f3ea2752
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f3ea2752
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f3ea2752
Branch: refs/heads/tlf
Commit: f3ea2752e3ef154cdf7c880f183528d325eefb4f
Parents: 09a4afc
Author: piotrz <pi...@apache.org>
Authored: Sun Jun 25 12:53:42 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Sun Jun 25 12:53:42 2017 +0200
----------------------------------------------------------------------
.../MaterialDesignLite/src/main/resources/mdl-manifest.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f3ea2752/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
index 53ce2fb..6c5b6ae 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
@@ -121,6 +121,6 @@
<component id="UpgradeChildren" class="org.apache.flex.mdl.beads.UpgradeChildren"/>
<component id="DropDownList" class="org.apache.flex.mdl.DropDownList"/>
<component id="DropDownListView" class="org.apache.flex.mdl.beads.views.DropDownListView"/>
- <component id="DropDownListItemRenderer" class="org.apache.flex.mdl.itemRenderers.DropDownListItemRenderer"/>W
+ <component id="DropDownListItemRenderer" class="org.apache.flex.mdl.itemRenderers.DropDownListItemRenderer"/>
</componentPackage>
[24/29] git commit: [flex-asjs] [refs/heads/tlf] - Fix merge error
removing support for numeric font size.
Posted by ha...@apache.org.
Fix merge error removing support for numeric font size.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/68f118b1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/68f118b1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/68f118b1
Branch: refs/heads/tlf
Commit: 68f118b1a56a49484c4e898826af4834c0cc2fa2
Parents: 18992c5
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Jun 29 16:20:17 2017 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Jun 29 16:20:17 2017 +1000
----------------------------------------------------------------------
.../flex/org/apache/flex/core/SimpleCSSValuesImpl.as | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/68f118b1/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
index f5d71ca..16b42c6 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
@@ -764,7 +764,13 @@ package org.apache.flex.core
'constructor': 1
};
-
+ /**
+ * The styles that can use raw numbers
+ */
+ COMPILE::JS
+ public static const numericStyles:Object = {
+ 'fontWeight': 1
+ };
/**
* @param thisObject The object to apply styles to;
@@ -777,6 +783,7 @@ package org.apache.flex.core
var styleList:Object = SimpleCSSValuesImpl.perInstanceStyles;
var colorStyles:Object = SimpleCSSValuesImpl.colorStyles;
var skipStyles:Object = SimpleCSSValuesImpl.skipStyles;
+ var numericStyles:Object = SimpleCSSValuesImpl.numericStyles;
var listObj:Object = styles;
if (styles.styleList)
listObj = styles.styleList;
@@ -791,6 +798,8 @@ package org.apache.flex.core
if (typeof(value) === 'number') {
if (colorStyles[p])
value = CSSUtils.attributeFromColor(value);
+ else if (numericStyles[p])
+ value = value.toString();
else
value = value.toString() + 'px';
}
[10/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 - Add
prompt property to MDL DropDownList - it displays text if nothing is selected
Posted by ha...@apache.org.
FLEX-35328 - Add prompt property to MDL DropDownList - it displays text if nothing is selected
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/69139d97
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/69139d97
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/69139d97
Branch: refs/heads/tlf
Commit: 69139d976fdfe282f8ee503b10f1c3d848fa7919
Parents: 2fc506e
Author: piotrz <pi...@apache.org>
Authored: Sat Jun 24 19:29:46 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Sat Jun 24 19:29:46 2017 +0200
----------------------------------------------------------------------
.../flex/org/apache/flex/mdl/DropDownList.as | 23 ++++++++++++++++++--
.../flex/mdl/beads/views/DropDownListView.as | 3 ++-
2 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/69139d97/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
index 2dddaf3..708b8ba 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DropDownList.as
@@ -23,7 +23,6 @@ package org.apache.flex.mdl
import org.apache.flex.core.UIBase;
import org.apache.flex.events.ItemAddedEvent;
import org.apache.flex.html.DataContainer;
- import org.apache.flex.html.Option;
import org.apache.flex.html.Select;
COMPILE::JS
@@ -56,13 +55,33 @@ package org.apache.flex.mdl
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public function DropDownList()
{
super();
}
+ private var _prompt:String;
+
+ /**
+ * The prompt for the DropDownList control.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function get prompt():String
+ {
+ return _prompt;
+ }
+
+ public function set prompt(value:String):void
+ {
+ _prompt = value;
+ }
+
protected var _dropDown:Select;
public function get dropDown():Select
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/69139d97/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as
index cad3e0d..de2d1a0 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as
@@ -47,7 +47,7 @@ package org.apache.flex.mdl.beads.views
* @copy org.apache.flex.core.IBead#strand
*
* @flexjsignorecoercion HTMLLabelElement
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@ -62,6 +62,7 @@ package org.apache.flex.mdl.beads.views
var dropDownList:DropDownList = (value as DropDownList);
dropDownList.labelDisplay = document.createElement('label') as HTMLLabelElement;
+ dropDownList.labelDisplay.innerText = dropDownList.prompt;
dropDownList.labelDisplay.classList.add("mdl-textfield__label");
dropDownList.dropDown = new Select();
[04/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 - Add
"select" and "option" to HTML module
Posted by ha...@apache.org.
FLEX-35328 - Add "select" and "option" to HTML module
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/486a243f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/486a243f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/486a243f
Branch: refs/heads/tlf
Commit: 486a243fe547d3fb22bc7298e5e93820606b23eb
Parents: fa45b0e
Author: piotrz <pi...@apache.org>
Authored: Fri Jun 23 08:51:23 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Fri Jun 23 08:51:23 2017 +0200
----------------------------------------------------------------------
.../main/flex/org/apache/flex/html/Option.as | 110 +++++++++++++++++++
.../main/flex/org/apache/flex/html/Select.as | 69 ++++++++++++
.../HTML/src/main/resources/basic-manifest.xml | 4 +-
3 files changed, 182 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/486a243f/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Option.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Option.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Option.as
new file mode 100644
index 0000000..a360f1b
--- /dev/null
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Option.as
@@ -0,0 +1,110 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.html
+{
+ import org.apache.flex.core.UIBase;
+
+ COMPILE::JS
+ {
+ import org.apache.flex.core.WrappedHTMLElement;
+ }
+
+ /**
+ * The Option class represents an HTML <option> element
+ *
+ *
+ * @toplevel
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public class Option extends UIBase
+ {
+ /**
+ * constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function Option()
+ {
+ super();
+ }
+
+ private var _text:String = "";
+
+ /**
+ * The text of the heading
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function get text():String
+ {
+ COMPILE::SWF
+ {
+ return _text;
+ }
+ COMPILE::JS
+ {
+ return textNode.nodeValue;
+ }
+ }
+
+ public function set text(value:String):void
+ {
+ COMPILE::SWF
+ {
+ _text = value;
+ }
+ COMPILE::JS
+ {
+ textNode.nodeValue = value;
+ }
+ }
+
+ COMPILE::JS
+ protected var textNode:Text;
+
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ * @flexjsignorecoercion HTMLElement
+ */
+ COMPILE::JS
+ override protected function createElement():WrappedHTMLElement
+ {
+ var option:HTMLOptionElement = document.createElement('option') as HTMLOptionElement;
+
+ textNode = document.createTextNode('') as Text;
+ option.appendChild(textNode);
+
+ element = option as WrappedHTMLElement;
+
+ positioner = element;
+ element.flexjs_wrapper = this;
+
+ return element;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/486a243f/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Select.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Select.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Select.as
new file mode 100644
index 0000000..99c024a
--- /dev/null
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Select.as
@@ -0,0 +1,69 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.html
+{
+ import org.apache.flex.core.UIBase;
+
+ COMPILE::JS
+ {
+ import org.apache.flex.core.WrappedHTMLElement;
+ }
+
+ /**
+ * The Select class represents an HTML <select> element
+ *
+ *
+ * @toplevel
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public class Select extends UIBase
+ {
+ /**
+ * constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function Select()
+ {
+ super();
+ }
+
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ * @flexjsignorecoercion HTMLSelectElement
+ */
+ COMPILE::JS
+ override protected function createElement():WrappedHTMLElement
+ {
+ var select:HTMLSelectElement = document.createElement('select') as HTMLSelectElement;
+ element = select as WrappedHTMLElement;
+
+ positioner = element;
+ element.flexjs_wrapper = this;
+
+ return element;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/486a243f/frameworks/projects/HTML/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/resources/basic-manifest.xml b/frameworks/projects/HTML/src/main/resources/basic-manifest.xml
index 4a47ba4..67b248f 100644
--- a/frameworks/projects/HTML/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/HTML/src/main/resources/basic-manifest.xml
@@ -34,7 +34,9 @@
<component id="I" class="org.apache.flex.html.I" />
<component id="Ul" class="org.apache.flex.html.Ul" />
<component id="Li" class="org.apache.flex.html.Li" />
-
+ <component id="Select" class="org.apache.flex.html.Select"/>
+ <component id="Option" class="org.apache.flex.html.Option"/>
+
<component id="Td" class="org.apache.flex.html.Td" />
<component id="Th" class="org.apache.flex.html.Th" />
[11/29] git commit: [flex-asjs] [refs/heads/tlf] - FLEX-35328 -
Update MDLExample DropDownList tab with prompt property when nothing is
selected
Posted by ha...@apache.org.
FLEX-35328 - Update MDLExample DropDownList tab with prompt property when nothing is selected
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/09a4afcc
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/09a4afcc
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/09a4afcc
Branch: refs/heads/tlf
Commit: 09a4afccf8605c9f17fd6f088d65195112ae0a33
Parents: 69139d9
Author: piotrz <pi...@apache.org>
Authored: Sat Jun 24 19:30:37 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Sat Jun 24 19:30:37 2017 +0200
----------------------------------------------------------------------
examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/09a4afcc/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml b/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
index a50413a..e17af31 100644
--- a/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
@@ -31,8 +31,7 @@ limitations under the License.
<mdl:Grid>
<mdl:GridCell columnDesktop="12">
<mdl:DropDownList id="dropDownList" labelField="label" width="150"
- selectedIndex="0"
- change="onDplChange(event)">
+ prompt="Text" change="onDplChange(event)">
<mdl:beads>
<js:ConstantBinding
sourceID="menuModel"
[27/29] git commit: [flex-asjs] [refs/heads/tlf] - Update MDLExample
with presentation of selectedValue in MDL DropDownList
Posted by ha...@apache.org.
Update MDLExample with presentation of selectedValue in MDL DropDownList
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0636f575
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0636f575
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0636f575
Branch: refs/heads/tlf
Commit: 0636f5755733c48d74cb76397a27dafad38a717c
Parents: f4d28a6
Author: piotrz <pi...@apache.org>
Authored: Thu Jun 29 21:55:14 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Thu Jun 29 21:55:14 2017 +0200
----------------------------------------------------------------------
examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0636f575/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml b/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
index 4231328..8dcf568 100644
--- a/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/DropDownList.mxml
@@ -49,11 +49,15 @@ limitations under the License.
<js:Label id="selectedItemChange"
text="Selected item on 'change' event: "/>
</mdl:GridCell>
+ <mdl:GridCell columnDesktop="12">
+ <js:Label id="selectedValue"
+ text="{'Selected value: ' + dropDownList.selectedValue}"/>
+ </mdl:GridCell>
</mdl:Grid>
<fx:Script><![CDATA[
public function onDplChange(event:Event):void
{
- selectedItemChange.text = "Selected item on 'change' event:" + dropDownList.selectedItem.label;
+ selectedItemChange.text = "Selected item on 'change' event: " + dropDownList.selectedItem.label;
}
]]></fx:Script>
</mdl:TabBarPanel>
\ No newline at end of file