Merge remote-tracking branch 'origin/feature/spriteflexjs-refactor' into feature/spriteflexjs-refactor
# Conflicts: # frameworks/projects/spriteflexjs/src/main/flex/SomeClass.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/5a725328 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5a725328 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5a725328 Branch: refs/heads/feature/spriteflexjs-refactor Commit: 5a725328d3c75ac7f1e83d874296f99217ab92a8 Parents: d3b47ac 3aeda90 Author: Christofer Dutz <[email protected]> Authored: Tue Feb 21 17:11:28 2017 +0100 Committer: Christofer Dutz <[email protected]> Committed: Tue Feb 21 17:11:28 2017 +0100 ---------------------------------------------------------------------- examples/.gitignore | 1 + .../src/main/flex/models/ProductsModel.as | 8 +- examples/pom.xml | 13 ++ .../projects/Core/src/main/flex/CoreClasses.as | 2 + .../org/apache/flex/core/BindableCSSStyles.as | 2 + .../org/apache/flex/core/StyleChangeNotifier.as | 82 +++++++++ .../org/apache/flex/events/StyleChangeEvent.as | 79 ++++++++ .../Core/src/main/resources/basic-manifest.xml | 2 + .../projects/HTML/src/main/flex/HTMLClasses.as | 3 +- .../flex/org/apache/flex/html/ImageButton.as | 45 +++-- .../flex/html/beads/SingleLineBorderBead.as | 2 +- .../SingleLineBorderWithChangeListenerBead.as | 73 ++++++++ .../flex/html/beads/SolidBackgroundBead.as | 21 ++- .../SolidBackgroundWithChangeListenerBead.as | 124 +------------ .../HTML/src/main/resources/basic-manifest.xml | 1 - .../HTML/src/main/resources/defaults.css | 1 + .../src/main/config/compile-as-config.xml | 1 + .../src/main/flex/MDLClasses.as | 5 +- .../src/main/flex/org/apache/flex/mdl/Button.as | 2 + .../main/flex/org/apache/flex/mdl/TextField.as | 4 +- .../TabsItemRendererFactoryForArrayListData.as | 181 +++++++++++++++++++ .../org/apache/flex/mdl/beads/UpgradeElement.as | 122 +++++++++++++ .../flex/mdl/beads/models/TabArrayListModel.as | 59 ++++++ .../flex/mdl/beads/models/TabArrayModel.as | 59 ++++++ .../apache/flex/mdl/beads/models/TabModel.as | 59 ------ .../src/main/resources/defaults.css | 4 +- .../spriteflexjs/src/main/flex/SomeClass.as | 2 +- 27 files changed, 741 insertions(+), 216 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5a725328/frameworks/projects/spriteflexjs/src/main/flex/SomeClass.as ---------------------------------------------------------------------- diff --cc frameworks/projects/spriteflexjs/src/main/flex/SomeClass.as index 2e53fd4,137beef..188cbac --- a/frameworks/projects/spriteflexjs/src/main/flex/SomeClass.as +++ b/frameworks/projects/spriteflexjs/src/main/flex/SomeClass.as @@@ -20,13 -20,10 +20,13 @@@ packag { public class SomeClass { - public var canvas:HTMLCanvasElement; - public var c2d:CanvasRenderingContext2D; + COMPILE::JS { + public var canvas:HTMLCanvasElement; + public var c2d:CanvasRenderingContext2D; + } - public function start2():void + COMPILE::JS - public function start2():void ++ public function start2():void { var button:Element = document.createElement("button"); button.onclick = function ():void {
