Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs 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/55f93ffc Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/55f93ffc Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/55f93ffc Branch: refs/heads/develop Commit: 55f93ffc4e0ae1f4542476dbb9a22560731321db Parents: 2d88ef0 f91b44d Author: Josh Tynjala <[email protected]> Authored: Mon Aug 3 11:38:53 2015 -0700 Committer: Josh Tynjala <[email protected]> Committed: Mon Aug 3 11:38:53 2015 -0700 ---------------------------------------------------------------------- .gitignore | 1 + LICENSE | 15 + LICENSE.bin | 13 + NOTICE | 3 + apache-flex-flexjs-installer-config.xml | 22 - build.xml | 28 +- examples/ContainerTest/build.xml | 48 ++ examples/ContainerTest/src/ContainerTest.mxml | 39 + examples/ContainerTest/src/MyInitialView.mxml | 188 +++++ .../ContainerTest/src/assets/logo_orange.png | Bin 0 -> 33897 bytes .../ContainerTest/src/models/ProductsModel.as | 44 + examples/ContainerTest/src/products/Product.as | 43 + .../src/products/ProductItemRenderer.as | 83 ++ examples/ContainerTest/src/smallbluerect.jpg | Bin 0 -> 13500 bytes examples/ContainerTest/src/smallgreenrect.jpg | Bin 0 -> 13542 bytes examples/ContainerTest/src/smallorangerect.gif | Bin 0 -> 821 bytes examples/ContainerTest/src/smallorangerect.jpg | Bin 0 -> 13571 bytes examples/ContainerTest/src/smallpurplerect.jpg | Bin 0 -> 13517 bytes examples/ContainerTest/src/smallredrect.jpg | Bin 0 -> 13477 bytes examples/ContainerTest/src/smallyellowrect.jpg | Bin 0 -> 13598 bytes .../DataBindingTest/src/DataBindingTest.mxml | 1 + examples/DataBindingTest/src/MyInitialView.mxml | 3 +- examples/DataBindingTest/src/models/MyModel.as | 1 + examples/DataBindingTest_Flat/build.xml | 48 ++ .../src/DataBindingTest.mxml | 53 ++ .../DataBindingTest_Flat/src/MyInitialView.mxml | 144 ++++ examples/DataBindingTest_Flat/src/README.txt | 52 ++ .../src/StockDataJSONItemConverter.as | 40 + .../src/controllers/MyController.as | 81 ++ .../DataBindingTest_Flat/src/models/MyModel.as | 125 +++ .../DataBindingTest_as/src/models/MyModel.as | 1 + examples/FlexJSStore/src/SupportView.mxml | 16 +- examples/ListsTest/src/products/Product.as | 43 + examples/MobileTrader/src/MyInitialView.mxml | 2 +- examples/MobileTrader/src/views/AlertsView.mxml | 14 +- .../MobileTrader/src/views/WatchListView.mxml | 6 +- examples/build.xml | 2 + examples/build_example.xml | 19 + frameworks/air-config-template.xml | 6 + frameworks/air-config.xml | 6 + frameworks/build.xml | 17 +- frameworks/downloads.xml | 64 +- frameworks/flex-config-template.xml | 6 + frameworks/flex-config.xml | 6 + frameworks/fontsrc/FlatUIIcons.as | 47 ++ frameworks/fontsrc/build.xml | 91 ++ .../org/apache/flex/charts/beads/ChartView.as | 4 + .../charts/beads/HorizontalCategoryAxisBead.as | 11 +- .../charts/beads/HorizontalLinearAxisBead.as | 11 +- .../charts/beads/VerticalCategoryAxisBead.as | 11 +- .../flex/charts/beads/VerticalLinearAxisBead.as | 11 +- .../flex/charts/beads/layouts/BarChartLayout.as | 10 +- .../charts/beads/layouts/ColumnChartLayout.as | 10 +- .../charts/supportClasses/ChartAxisGroup.js | 6 + frameworks/projects/Core/as/src/CoreClasses.as | 7 +- .../as/src/org/apache/flex/core/Application.as | 44 +- .../as/src/org/apache/flex/core/BeadViewBase.as | 35 +- .../src/org/apache/flex/core/CSSFontFaceBead.as | 146 ++++ .../as/src/org/apache/flex/core/CSSShape.as | 162 ++++ .../as/src/org/apache/flex/core/CSSSprite.as | 162 ++++ .../as/src/org/apache/flex/core/CSSTextField.as | 87 +- .../as/src/org/apache/flex/core/IBeadView.as | 20 - .../org/apache/flex/core/SimpleCSSValuesImpl.as | 24 +- .../apache/flex/core/StyleableCSSTextField.as | 200 +++++ .../Core/as/src/org/apache/flex/core/UIBase.as | 76 +- .../as/src/org/apache/flex/core/UIButtonBase.as | 6 +- .../as/src/org/apache/flex/utils/BeadMetrics.as | 141 ++-- .../src/org/apache/flex/utils/CSSBorderUtils.as | 218 +++++ .../as/src/org/apache/flex/utils/CSSUtils.as | 323 ++++++++ .../org/apache/flex/utils/SolidBorderUtil.as | 138 +++- .../src/org/apache/flex/utils/StringTrimmer.as | 175 ++++ .../as/src/org/apache/flex/utils/UIUtils.as | 9 +- frameworks/projects/Core/basic-manifest.xml | 1 + .../js/src/org/apache/flex/core/BeadViewBase.js | 9 +- .../src/org/apache/flex/core/CSSFontFaceBead.js | 54 ++ frameworks/projects/Flat/as/defaults.css | 825 +++++++++++++++++++ frameworks/projects/Flat/as/src/FlatClasses.as | 37 + .../as/src/org/apache/flex/flat/CheckBox.as | 47 ++ .../as/src/org/apache/flex/flat/DropDownList.as | 46 ++ .../as/src/org/apache/flex/flat/RadioButton.as | 47 ++ .../beads/CSSContentAndTextToggleButtonView.as | 304 +++++++ .../flex/flat/beads/CSSScrollBarButtonView.as | 178 ++++ .../apache/flex/flat/beads/CSSScrollBarView.as | 241 ++++++ ...CheckboxCSSContentAndTextToggleButtonView.as | 48 ++ .../apache/flex/flat/beads/DropDownListView.as | 303 +++++++ .../RadioCSSContentAndTextToggleButtonView.as | 47 ++ .../flat/supportClasses/DropDownListList.as | 64 ++ .../DropDownListStringItemRenderer.as | 70 ++ frameworks/projects/Flat/build.xml | 161 ++++ frameworks/projects/Flat/compile-config.xml | 91 ++ frameworks/projects/Flat/flat-manifest.xml | 107 +++ .../js/src/org/apache/flex/flat/CheckBox.js | 137 +++ .../js/src/org/apache/flex/flat/DropDownList.js | 219 +++++ .../js/src/org/apache/flex/flat/RadioButton.js | 227 +++++ frameworks/projects/HTML/as/defaults.css | 85 +- frameworks/projects/HTML/as/src/HTMLClasses.as | 6 +- .../HTML/as/src/org/apache/flex/html/List.as | 2 +- .../org/apache/flex/html/beads/ButtonBarView.as | 4 +- .../org/apache/flex/html/beads/CSSButtonView.as | 89 +- .../apache/flex/html/beads/CSSTextButtonView.as | 101 ++- .../org/apache/flex/html/beads/CheckBoxView.as | 12 +- .../org/apache/flex/html/beads/ContainerView.as | 227 ++++- .../flex/html/beads/DownArrowButtonView.as | 26 +- .../apache/flex/html/beads/DropDownListView.as | 103 +-- .../flex/html/beads/HScrollBarThumbView.as | 120 +++ .../flex/html/beads/HScrollBarTrackView.as | 118 +++ .../apache/flex/html/beads/HScrollBarView.as | 99 +++ .../flex/html/beads/LeftArrowButtonView.as | 112 +++ .../src/org/apache/flex/html/beads/ListView.as | 39 +- .../src/org/apache/flex/html/beads/PanelView.as | 3 +- .../flex/html/beads/PanelWithControlBarView.as | 2 - .../apache/flex/html/beads/RadioButtonView.as | 8 +- .../flex/html/beads/RightArrowButtonView.as | 112 +++ .../org/apache/flex/html/beads/ScrollBarView.as | 42 +- .../flex/html/beads/SingleLineBorderBead.as | 27 +- .../flex/html/beads/SolidBackgroundBead.as | 36 +- .../org/apache/flex/html/beads/TextAreaView.as | 30 +- .../apache/flex/html/beads/TextFieldViewBase.as | 86 +- .../org/apache/flex/html/beads/TextInputView.as | 49 +- .../apache/flex/html/beads/UpArrowButtonView.as | 22 +- .../flex/html/beads/VScrollBarThumbView.as | 25 +- .../flex/html/beads/VScrollBarTrackView.as | 29 +- .../apache/flex/html/beads/VScrollBarView.as | 99 +++ .../beads/controllers/DropDownListController.as | 12 +- .../controllers/HScrollBarMouseController.as | 101 +++ .../flex/html/beads/layouts/BasicLayout.as | 30 - .../flex/html/beads/layouts/ButtonBarLayout.as | 39 +- .../flex/html/beads/layouts/HScrollBarLayout.as | 121 +++ .../flex/html/beads/layouts/HorizontalLayout.as | 37 +- .../flex/html/beads/layouts/TileLayout.as | 37 +- .../flex/html/beads/layouts/VScrollBarLayout.as | 12 +- .../flex/html/beads/layouts/VerticalLayout.as | 37 +- .../html/supportClasses/DropDownListList.as | 12 - .../flex/html/supportClasses/HScrollBar.as | 49 ++ .../html/supportClasses/ScrollingViewport.as | 46 +- .../html/supportClasses/StringItemRenderer.as | 11 +- .../flex/html/supportClasses/VScrollBar.as | 49 ++ .../asjs/src/org/apache/flex/html/DateField.as | 5 + .../org/apache/flex/html/MXMLBeadViewBase.as | 11 - .../org/apache/flex/html/beads/DateFieldView.as | 10 +- .../controllers/DateFieldMouseController.as | 2 - frameworks/projects/HTML/basic-manifest.xml | 5 +- .../js/src/org/apache/flex/html/CheckBox.js | 3 + .../js/src/org/apache/flex/html/DropDownList.js | 8 +- .../HTML/js/src/org/apache/flex/html/Panel.js | 6 +- .../js/src/org/apache/flex/html/RadioButton.js | 3 + .../js/src/org/apache/flex/html/TextArea.js | 2 + .../js/src/org/apache/flex/html/TextInput.js | 2 + .../org/apache/flex/html/beads/ButtonBarView.js | 1 - .../org/apache/flex/html/beads/ContainerView.js | 160 +++- .../src/org/apache/flex/html/beads/ListView.js | 23 +- .../src/org/apache/flex/html/beads/PanelView.js | 35 +- .../flex/html/beads/layouts/ButtonBarLayout.js | 2 + .../flex/html/beads/layouts/HorizontalLayout.js | 1 - .../flex/html/beads/layouts/TileLayout.js | 29 + .../flex/html/beads/models/ViewportModel.js | 153 ++++ .../html/supportClasses/ContainerContentArea.js | 60 ++ .../html/supportClasses/ScrollingViewport.js | 37 +- .../apache/flex/html/supportClasses/Viewport.js | 24 +- .../flex/mobile/beads/TabbedViewManagerView.as | 4 +- installer.xml | 2 +- mustella/tests/basicTests/BasicTests.css | 339 ++++---- mustella/tests/basicTests/BasicTestsApp.mxml | 14 +- nightly.properties | 18 +- 164 files changed, 8790 insertions(+), 1206 deletions(-) ----------------------------------------------------------------------
