Merge branch 'release0.8.0' 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/1d68cd8b Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1d68cd8b Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1d68cd8b Branch: refs/heads/tlf Commit: 1d68cd8b78d700f795a6c11b7b8c654c626eccc9 Parents: 2a02f94 78f704c Author: Alex Harui <[email protected]> Authored: Mon Jun 26 10:50:21 2017 -0700 Committer: Alex Harui <[email protected]> Committed: Mon Jun 26 10:50:21 2017 -0700 ---------------------------------------------------------------------- ApproveFlexJS.xml | 77 +- RELEASE_NOTES | 20 +- .../main/resources/archetype-resources/pom.xml | 3 +- .../main/resources/archetype-resources/pom.xml | 2 +- .../pom.xml | 6 +- .../main/resources/archetype-resources/pom.xml | 2 +- build.xml | 43 +- cordova-build.xml | 8 +- distribution/pom.xml | 17 +- distribution/src/main/assembly/component.xml | 19 +- .../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 | 1 + .../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 | 5 +- .../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 | 3 +- .../src/main/config/compile-app-config.xml | 27 + examples/flexjs/MDLDynamicTabsExample/pom.xml | 3 +- examples/flexjs/MDLExample/build.xml | 11 +- examples/flexjs/MDLExample/pom.xml | 3 +- .../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 | 8 +- 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 | 71 +- .../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 +- pom.xml | 2 +- releasecandidate.xml | 43 +- 405 files changed, 9051 insertions(+), 4311 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/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..1265b93 --- 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> @@@ -95,4 -96,4 +96,4 @@@ </profile> </profiles> --</project> ++</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --cc archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml index 077ec0f,1ec5a49..2702f1d --- a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml @@@ -87,4 -87,4 +87,4 @@@ </profile> </profiles> --</project> ++</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --cc archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml index 43b3788,add0092..dae0d44 --- a/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml @@@ -68,4 -68,4 +68,4 @@@ </dependency> </dependencies> --</project> ++</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/distribution/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/express/DataBindingExample/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/express/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/ASDoc/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/ChartExample/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/CordovaCameraExample/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/CreateJSExample/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/DataBindingExample/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/DataBindingExample_Flat/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/DataBindingExample_as/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/DateControlsExample/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/DesktopMap/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/FlexJSStore/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/FlexJSStore_jquery/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/FlexTeamPage_MDL/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/FlexTeamPage_MDL/pom.xml index 0ced478,f212838..3c73743 --- a/examples/flexjs/FlexTeamPage_MDL/pom.xml +++ b/examples/flexjs/FlexTeamPage_MDL/pom.xml @@@ -111,4 -116,4 +114,4 @@@ </dependency> </dependencies> --</project> ++</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/FlexWebsiteStatsViewer/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/ListExample/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/MDLBlogExample/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/MDLBlogExample/pom.xml index c72f4cc,262a020..fc693ee --- 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 --> @@@ -80,4 -81,4 +81,4 @@@ </dependency> </dependencies> --</project> ++</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/MDLDynamicTabsExample/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/MDLDynamicTabsExample/pom.xml index 3114ef2,12ac364..db429a1 --- a/examples/flexjs/MDLDynamicTabsExample/pom.xml +++ b/examples/flexjs/MDLDynamicTabsExample/pom.xml @@@ -81,4 -84,4 +82,4 @@@ </dependencies> --</project> ++</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/MDLExample/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/MDLExample/pom.xml index 92c9117,6349eec..fb88e3c --- a/examples/flexjs/MDLExample/pom.xml +++ b/examples/flexjs/MDLExample/pom.xml @@@ -85,4 -88,4 +86,4 @@@ </dependency> </dependencies> --</project> ++</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/MapSearch/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/MobileMap/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/MobileStocks/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/MobileTrader/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/StorageExample/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/StyleExample/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/TeamPage/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/TeamPage/pom.xml index fcbaa33,854790d..a41460f --- a/examples/flexjs/TeamPage/pom.xml +++ b/examples/flexjs/TeamPage/pom.xml @@@ -49,7 -51,14 +49,6 @@@ </build> <dependencies> -- <!-- Already added in parent --> - <!--dependency> - <groupId>org.apache.flex.flexjs.framework</groupId> - <artifactId>Core</artifactId> - <version>0.8.0</version> - <type>swc</type> - </dependency--> - <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Network</artifactId> @@@ -89,4 -99,4 +89,4 @@@ </dependency--> </dependencies> --</project> ++</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/examples/flexjs/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/frameworks/projects/Basic/src/main/flex/BasicClasses.as ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/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/1d68cd8b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ContainerView.as ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/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..7f21708 --- 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") - obj[valueName] = null; - else if (value == "true") - obj[valueName] = true; - else if (value == "false") - obj[valueName] = false; + if (value === "null") + obj[pieces[0]] = null; + else if (value === "true") + obj[pieces[0]] = true; + else if (value === "false") + obj[pieces[0]] = 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,42 @@@ } asValues[valueName] = v; } - values[ruleName] = asValues; + this.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) ++ for (var p:String in ruleValues) + { - var value:Object = values[p]; ++ var value:Object = ruleValues[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); + } ++>>>>>>> release0.8.0 } + + COMPILE::JS + private var ss:CSSStyleSheet; /** * A map of inheriting styles @@@ -704,16 -739,8 +754,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 +789,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'; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d68cd8b/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 921734a,919b7d1..3b7a438 --- a/pom.xml +++ b/pom.xml @@@ -373,4 -367,4 +373,4 @@@ </pluginRepository> </pluginRepositories> --</project> ++</project>
