You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/07/28 20:41:02 UTC

[36/36] git commit: [flex-asjs] [refs/heads/develop] - merge flatui branch

merge flatui branch


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d54c90d9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d54c90d9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d54c90d9

Branch: refs/heads/develop
Commit: d54c90d928017d7606b4815355eb6ecfb87925f7
Parents: d3b4e74 acfe9b7
Author: Alex Harui <ah...@apache.org>
Authored: Tue Jul 28 11:33:33 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Jul 28 11:33:33 2015 -0700

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 LICENSE                                         |  12 +
 LICENSE.bin                                     |  13 +
 build.xml                                       |  15 +-
 .../DataBindingTest/src/DataBindingTest.mxml    |   1 +
 examples/DataBindingTest/src/MyInitialView.mxml |   3 +-
 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  | 124 +++
 examples/build_example.xml                      |  19 +
 frameworks/air-config-template.xml              |   6 +
 frameworks/air-config.xml                       |   6 +
 frameworks/build.xml                            |  15 +-
 frameworks/downloads.xml                        |  44 +-
 frameworks/flex-config-template.xml             |   6 +
 frameworks/flex-config.xml                      |   6 +
 frameworks/fontsrc/FlatUIIcons.as               |  47 ++
 frameworks/fontsrc/build.xml                    |  91 ++
 frameworks/projects/Core/as/src/CoreClasses.as  |   7 +-
 .../as/src/org/apache/flex/core/Application.as  |  44 +-
 .../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 +-
 .../org/apache/flex/core/SimpleCSSValuesImpl.as |  24 +-
 .../apache/flex/core/StyleableCSSTextField.as   | 200 +++++
 .../as/src/org/apache/flex/core/UIButtonBase.as |   6 +-
 .../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 ++++
 frameworks/projects/Core/basic-manifest.xml     |   1 +
 .../src/org/apache/flex/core/CSSFontFaceBead.js |  54 ++
 frameworks/projects/Flat/as/defaults.css        | 822 +++++++++++++++++++
 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           |  71 ++
 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        |  73 +-
 frameworks/projects/HTML/as/src/HTMLClasses.as  |   1 +
 .../org/apache/flex/html/beads/CSSButtonView.as |  89 +-
 .../apache/flex/html/beads/CSSTextButtonView.as | 101 ++-
 .../org/apache/flex/html/beads/CheckBoxView.as  |  12 +-
 .../flex/html/beads/DownArrowButtonView.as      |  24 +-
 .../apache/flex/html/beads/DropDownListView.as  |  93 ++-
 .../apache/flex/html/beads/RadioButtonView.as   |   8 +-
 .../flex/html/beads/SingleLineBorderBead.as     |  27 +-
 .../flex/html/beads/SolidBackgroundBead.as      |  36 +-
 .../org/apache/flex/html/beads/TextAreaView.as  |  17 +-
 .../apache/flex/html/beads/TextFieldViewBase.as |  14 +-
 .../org/apache/flex/html/beads/TextInputView.as |  44 +-
 .../apache/flex/html/beads/UpArrowButtonView.as |  22 +-
 .../flex/html/beads/VScrollBarThumbView.as      |  25 +-
 .../flex/html/beads/VScrollBarTrackView.as      |  12 +-
 .../beads/controllers/DropDownListController.as |   5 +-
 .../flex/html/beads/layouts/VScrollBarLayout.as |   6 +-
 .../html/supportClasses/DropDownListList.as     |  12 -
 frameworks/projects/HTML/basic-manifest.xml     |   2 +
 .../js/src/org/apache/flex/html/CheckBox.js     |   3 +
 .../js/src/org/apache/flex/html/DropDownList.js |   8 +-
 .../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 +
 .../flex/html/beads/layouts/HorizontalLayout.js |   1 -
 mustella/tests/basicTests/BasicTests.css        | 339 ++++----
 mustella/tests/basicTests/BasicTestsApp.mxml    |  14 +-
 84 files changed, 6255 insertions(+), 511 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d54c90d9/frameworks/projects/HTML/as/defaults.css
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d54c90d9/frameworks/projects/HTML/as/src/HTMLClasses.as
----------------------------------------------------------------------
diff --cc frameworks/projects/HTML/as/src/HTMLClasses.as
index fc5c993,e8b2165..61feb38
--- a/frameworks/projects/HTML/as/src/HTMLClasses.as
+++ b/frameworks/projects/HTML/as/src/HTMLClasses.as
@@@ -52,8 -52,7 +52,9 @@@ internal class HTMLClasse
      import org.apache.flex.html.beads.PanelView; PanelView;
      import org.apache.flex.html.beads.PanelWithControlBarView; PanelWithControlBarView;
  	import org.apache.flex.html.beads.RadioButtonView; RadioButtonView;
 +	import org.apache.flex.html.beads.VScrollBarView; VScrollBarView;
 +	import org.apache.flex.html.beads.HScrollBarView; HScrollBarView;
+     import org.apache.flex.html.beads.ScrollBarView; ScrollBarView;
  	import org.apache.flex.html.beads.SimpleAlertView; SimpleAlertView;
      import org.apache.flex.html.beads.SingleLineBorderBead; SingleLineBorderBead;
  	import org.apache.flex.html.beads.SliderView; SliderView;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d54c90d9/frameworks/projects/HTML/basic-manifest.xml
----------------------------------------------------------------------