Merge branch 'develop' into tlf # Conflicts: # distribution/pom.xml # distribution/src/main/assembly/component.xml # examples/express/DataBindingExample/pom.xml # examples/flexjs/DataBindingExampleWithFlexLayout/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/43a696c2 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/43a696c2 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/43a696c2 Branch: refs/heads/tlf Commit: 43a696c262e6c7884563f6f121c335120e25ccd2 Parents: 1907015 a89f0ec Author: piotrz <pio...@apache.org> Authored: Sun Jun 18 14:14:00 2017 +0200 Committer: piotrz <pio...@apache.org> Committed: Sun Jun 18 14:14:00 2017 +0200 ---------------------------------------------------------------------- .../flexjs-simple-application-archetype/pom.xml | 4 +- .../main/resources/archetype-resources/pom.xml | 6 +- .../pom.xml | 4 +- .../main/resources/archetype-resources/pom.xml | 6 +- .../pom.xml | 4 +- .../main/resources/archetype-resources/pom.xml | 2 +- .../flexjs-simple-library-archetype/pom.xml | 4 +- .../main/resources/archetype-resources/pom.xml | 6 +- .../flexjs-simple-typedef-archetype/pom.xml | 4 +- .../main/resources/archetype-resources/pom.xml | 6 +- archetypes/pom.xml | 4 +- distribution/jars/compc/pom.xml | 10 +- distribution/jars/falcon-asc/pom.xml | 10 +- distribution/jars/falcon-compc/pom.xml | 10 +- distribution/jars/falcon-mxmlc/pom.xml | 10 +- distribution/jars/falcon-optimizer/pom.xml | 10 +- distribution/jars/falcon-swfdump/pom.xml | 10 +- distribution/jars/mxmlc/pom.xml | 10 +- distribution/pom.xml | 139 +++--- distribution/src/main/assembly/component.xml | 4 +- examples/examples-integrationtests/pom.xml | 58 ++- examples/examples-tests/pom.xml | 4 +- examples/express/DataBindingExample/pom.xml | 12 +- examples/express/pom.xml | 18 +- examples/flexjs/ASDoc/pom.xml | 12 +- examples/flexjs/ChartExample/pom.xml | 12 +- examples/flexjs/CordovaCameraExample/pom.xml | 12 +- examples/flexjs/CreateJSExample/pom.xml | 12 +- examples/flexjs/DataBindingExample/pom.xml | 12 +- .../DataBindingExampleWithFlexLayout/pom.xml | 10 +- examples/flexjs/DataBindingExample_Flat/pom.xml | 20 +- examples/flexjs/DataBindingExample_as/pom.xml | 12 +- examples/flexjs/DataGridExample/pom.xml | 8 +- examples/flexjs/DateControlsExample/pom.xml | 12 +- examples/flexjs/DesktopMap/pom.xml | 12 +- examples/flexjs/FlexJSStore/pom.xml | 24 +- examples/flexjs/FlexJSStore_jquery/pom.xml | 28 +- examples/flexjs/FlexTeamPage_MDL/pom.xml | 22 +- examples/flexjs/FlexWebsiteStatsViewer/pom.xml | 16 +- examples/flexjs/HelloWorld/pom.xml | 8 +- examples/flexjs/ListExample/pom.xml | 12 +- examples/flexjs/MDLBlogExample/pom.xml | 8 +- examples/flexjs/MDLDynamicTabsExample/pom.xml | 14 +- examples/flexjs/MDLExample/pom.xml | 14 +- examples/flexjs/MapSearch/pom.xml | 12 +- examples/flexjs/MobileMap/pom.xml | 16 +- examples/flexjs/MobileStocks/pom.xml | 28 +- examples/flexjs/MobileTrader/pom.xml | 20 +- examples/flexjs/StorageExample/pom.xml | 12 +- examples/flexjs/StyleExample/pom.xml | 12 +- examples/flexjs/TableExample/pom.xml | 4 +- examples/flexjs/TeamPage/pom.xml | 19 +- examples/flexjs/TodoListSampleApp/pom.xml | 8 +- examples/flexjs/TreeExample/pom.xml | 8 +- examples/flexjs/pom.xml | 34 +- examples/native/AngularExample/pom.xml | 4 +- examples/native/ButtonExample/pom.xml | 8 +- examples/native/USStatesMap/pom.xml | 10 +- examples/native/pom.xml | 8 +- examples/node/HelloWorld/pom.xml | 53 +++ .../node/HelloWorld/src/main/flex/HelloWorld.as | 29 ++ examples/node/pom.xml | 63 +++ examples/pom.xml | 10 +- frameworks/fontsrc/pom.xml | 4 +- frameworks/pom.xml | 4 +- frameworks/projects/Basic/pom.xml | 20 +- .../Basic/src/main/flex/BasicClasses.as | 3 +- .../org/apache/flex/core/HTMLElementWrapper.as | 2 +- .../flex/org/apache/flex/core/LayoutBase.as | 40 +- .../main/flex/org/apache/flex/core/UIBase.as | 92 ++-- .../flex/html/accessories/PasswordInputBead.as | 2 +- .../accessories/PasswordInputRemovableBead.as | 75 ++++ .../org/apache/flex/html/beads/ContainerView.as | 2 +- .../Basic/src/main/resources/basic-manifest.xml | 1 + frameworks/projects/Binding/pom.xml | 8 +- frameworks/projects/Charts/pom.xml | 24 +- frameworks/projects/Collections/pom.xml | 8 +- .../org/apache/flex/collections/ArrayList.as | 26 +- .../apache/flex/collections/FlattenedList.as | 15 +- frameworks/projects/Core/pom.xml | 4 +- .../org/apache/flex/core/SimpleCSSValuesImpl.as | 193 ++++---- .../flex/org/apache/flex/events/CustomEvent.as | 13 + .../flex/org/apache/flex/events/DetailEvent.as | 12 + .../main/flex/org/apache/flex/events/Event.as | 18 +- .../org/apache/flex/events/KeyboardEvent.as | 12 + .../flex/org/apache/flex/events/MouseEvent.as | 2 +- .../org/apache/flex/events/ProgressEvent.as | 14 +- .../org/apache/flex/events/ValueChangeEvent.as | 13 + .../flex/org/apache/flex/events/ValueEvent.as | 12 + .../main/flex/org/apache/flex/utils/CSSUtils.as | 22 +- .../flex/org/apache/flex/utils/EffectTimer.as | 75 ++-- .../flex/org/apache/flex/utils/StringUtil.as | 25 +- frameworks/projects/CreateJS/pom.xml | 20 +- frameworks/projects/DragDrop/pom.xml | 8 +- frameworks/projects/Effects/pom.xml | 12 +- .../org/apache/flex/effects/PlatformWiper.as | 2 +- .../main/flex/org/apache/flex/effects/Tween.as | 450 ++++++++++--------- .../main/flex/org/apache/flex/effects/Wipe.as | 9 +- frameworks/projects/Express/pom.xml | 24 +- frameworks/projects/Flat/pom.xml | 22 +- frameworks/projects/FontAwesome/pom.xml | 24 +- frameworks/projects/Formatters/pom.xml | 12 +- frameworks/projects/GoogleMaps/pom.xml | 14 +- frameworks/projects/Graphics/pom.xml | 8 +- frameworks/projects/HTML/pom.xml | 24 +- frameworks/projects/HTML5/pom.xml | 12 +- frameworks/projects/JQuery/pom.xml | 12 +- frameworks/projects/Language/pom.xml | 4 +- frameworks/projects/MaterialDesignLite/pom.xml | 28 +- frameworks/projects/Mobile/pom.xml | 16 +- frameworks/projects/Network/pom.xml | 8 +- frameworks/projects/Reflection/pom.xml | 8 +- frameworks/projects/Storage/pom.xml | 8 +- frameworks/projects/XML/pom.xml | 12 +- frameworks/projects/pom.xml | 4 +- pom.xml | 16 +- testsuite/pom.xml | 4 +- 117 files changed, 1394 insertions(+), 1101 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/43a696c2/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 82cb6d8,d2f9015..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,9 -81,8 +81,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Language</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/distribution/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/43a696c2/distribution/src/main/assembly/component.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/43a696c2/examples/express/DataBindingExample/pom.xml ---------------------------------------------------------------------- diff --cc examples/express/DataBindingExample/pom.xml index 50fa559,78e6908..057d397 --- a/examples/express/DataBindingExample/pom.xml +++ b/examples/express/DataBindingExample/pom.xml @@@ -60,8 -57,7 +58,8 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Network</artifactId> - <version>0.8.0-SNAPSHOT</version> + <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/43a696c2/examples/express/pom.xml ---------------------------------------------------------------------- diff --cc examples/express/pom.xml index ed732ed,67945a9..b279ab9 --- a/examples/express/pom.xml +++ b/examples/express/pom.xml @@@ -87,9 -71,8 +85,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Express</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -101,9 -84,8 +99,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Language</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/ASDoc/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/ASDoc/pom.xml index e39290f,ab9b743..52f6992 --- a/examples/flexjs/ASDoc/pom.xml +++ b/examples/flexjs/ASDoc/pom.xml @@@ -52,9 -50,8 +50,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Network</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/ChartExample/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/ChartExample/pom.xml index a9044b2,fa404a5..b3af428 --- a/examples/flexjs/ChartExample/pom.xml +++ b/examples/flexjs/ChartExample/pom.xml @@@ -65,9 -63,8 +63,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Charts</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/CordovaCameraExample/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/CordovaCameraExample/pom.xml index fcea62e,c46b4ad..b2b0318 --- a/examples/flexjs/CordovaCameraExample/pom.xml +++ b/examples/flexjs/CordovaCameraExample/pom.xml @@@ -63,9 -61,8 +61,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Mobile</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/CreateJSExample/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/CreateJSExample/pom.xml index dcae6d8,2abdd25..a7d1cf9 --- a/examples/flexjs/CreateJSExample/pom.xml +++ b/examples/flexjs/CreateJSExample/pom.xml @@@ -65,9 -63,8 +63,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>CreateJS</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/DataBindingExample/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/DataBindingExample/pom.xml index 3c853e3,0491632..d2e1601 --- a/examples/flexjs/DataBindingExample/pom.xml +++ b/examples/flexjs/DataBindingExample/pom.xml @@@ -59,9 -57,8 +57,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Network</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/DataBindingExample_Flat/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/DataBindingExample_Flat/pom.xml index 87dc4ed,4aaef62..f8c0e61 --- a/examples/flexjs/DataBindingExample_Flat/pom.xml +++ b/examples/flexjs/DataBindingExample_Flat/pom.xml @@@ -109,9 -107,8 +107,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Flat</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -123,9 -120,8 +121,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Network</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/DataBindingExample_as/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/DataBindingExample_as/pom.xml index b7745d5,c08b8ce..095e2ba --- a/examples/flexjs/DataBindingExample_as/pom.xml +++ b/examples/flexjs/DataBindingExample_as/pom.xml @@@ -86,9 -84,8 +84,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Network</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/DateControlsExample/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/DateControlsExample/pom.xml index 434a404,43c2c3a..800f54a --- a/examples/flexjs/DateControlsExample/pom.xml +++ b/examples/flexjs/DateControlsExample/pom.xml @@@ -62,9 -60,8 +60,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Formatters</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/DesktopMap/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/DesktopMap/pom.xml index bc29871,f9df11b..a778ab1 --- a/examples/flexjs/DesktopMap/pom.xml +++ b/examples/flexjs/DesktopMap/pom.xml @@@ -66,9 -64,8 +64,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>GoogleMaps</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/FlexJSStore/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/FlexJSStore/pom.xml index 587b585,18c2ada..680bd17 --- a/examples/flexjs/FlexJSStore/pom.xml +++ b/examples/flexjs/FlexJSStore/pom.xml @@@ -86,9 -84,8 +84,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>DragDrop</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -100,9 -97,8 +98,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Effects</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -114,9 -110,8 +112,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Formatters</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -128,9 -123,8 +126,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Network</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/FlexJSStore_jquery/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/FlexJSStore_jquery/pom.xml index 5666ab3,9c20e0a..082c67b --- a/examples/flexjs/FlexJSStore_jquery/pom.xml +++ b/examples/flexjs/FlexJSStore_jquery/pom.xml @@@ -74,9 -72,8 +72,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>DragDrop</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -88,9 -85,8 +86,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Effects</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -102,9 -98,8 +100,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Formatters</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -116,9 -111,8 +114,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>JQuery</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -130,9 -124,8 +128,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Network</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/FlexTeamPage_MDL/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/FlexTeamPage_MDL/pom.xml index f007280,0ced478..3baaa3c --- a/examples/flexjs/FlexTeamPage_MDL/pom.xml +++ b/examples/flexjs/FlexTeamPage_MDL/pom.xml @@@ -66,9 -64,8 +64,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>MaterialDesignLite</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -80,9 -77,8 +78,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>FontAwesome</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -94,9 -90,8 +92,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Network</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/FlexWebsiteStatsViewer/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/FlexWebsiteStatsViewer/pom.xml index 8cc4999,e0a3c39..1e48dfa --- a/examples/flexjs/FlexWebsiteStatsViewer/pom.xml +++ b/examples/flexjs/FlexWebsiteStatsViewer/pom.xml @@@ -60,9 -58,8 +58,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Network</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -74,9 -71,8 +72,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Charts</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/ListExample/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/ListExample/pom.xml index 2ff1a6c,47cfc07..0f720f2 --- a/examples/flexjs/ListExample/pom.xml +++ b/examples/flexjs/ListExample/pom.xml @@@ -63,9 -61,8 +61,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Network</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/MDLBlogExample/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/MDLBlogExample/pom.xml index f878681,c72f4cc..6ad5983 --- a/examples/flexjs/MDLBlogExample/pom.xml +++ b/examples/flexjs/MDLBlogExample/pom.xml @@@ -66,9 -66,8 +66,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>MaterialDesignLite</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/MDLDynamicTabsExample/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/MDLDynamicTabsExample/pom.xml index c6f0e87,3114ef2..66dd34a --- a/examples/flexjs/MDLDynamicTabsExample/pom.xml +++ b/examples/flexjs/MDLDynamicTabsExample/pom.xml @@@ -70,9 -68,8 +68,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>MaterialDesignLite</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/MDLExample/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/MDLExample/pom.xml index 3bb8d2b,92c9117..aaf54ea --- a/examples/flexjs/MDLExample/pom.xml +++ b/examples/flexjs/MDLExample/pom.xml @@@ -66,9 -64,8 +64,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>MaterialDesignLite</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/MapSearch/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/MapSearch/pom.xml index 7bf36f9,a4db197..9709e1e --- a/examples/flexjs/MapSearch/pom.xml +++ b/examples/flexjs/MapSearch/pom.xml @@@ -70,9 -68,8 +68,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>GoogleMaps</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/MobileMap/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/MobileMap/pom.xml index 151dc16,67bde92..cec2b6f --- a/examples/flexjs/MobileMap/pom.xml +++ b/examples/flexjs/MobileMap/pom.xml @@@ -68,9 -66,8 +66,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Mobile</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -82,9 -79,8 +80,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>GoogleMaps</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/MobileStocks/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/MobileStocks/pom.xml index 53632f8,1d8ce7d..01c0748 --- a/examples/flexjs/MobileStocks/pom.xml +++ b/examples/flexjs/MobileStocks/pom.xml @@@ -70,9 -68,8 +68,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Charts</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -84,9 -81,8 +82,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Mobile</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -98,9 -94,8 +96,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Network</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -112,9 -107,8 +110,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Storage</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -126,9 -120,8 +124,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>XML</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/MobileTrader/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/MobileTrader/pom.xml index 465ca82,cf58798..f0b9acf --- a/examples/flexjs/MobileTrader/pom.xml +++ b/examples/flexjs/MobileTrader/pom.xml @@@ -70,9 -68,8 +68,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Charts</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -84,9 -81,8 +82,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Mobile</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -98,9 -94,8 +96,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Network</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/StorageExample/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/StorageExample/pom.xml index 08460ee,6f159bf..c9d2bc6 --- a/examples/flexjs/StorageExample/pom.xml +++ b/examples/flexjs/StorageExample/pom.xml @@@ -63,9 -61,8 +61,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Storage</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/StyleExample/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/StyleExample/pom.xml index 92a1310,b5f7936..a98dc69 --- a/examples/flexjs/StyleExample/pom.xml +++ b/examples/flexjs/StyleExample/pom.xml @@@ -71,9 -69,8 +69,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Network</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/TeamPage/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/TeamPage/pom.xml index 233315e,fcbaa33..35f3c1a --- a/examples/flexjs/TeamPage/pom.xml +++ b/examples/flexjs/TeamPage/pom.xml @@@ -55,16 -53,8 +53,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Network</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/examples/flexjs/pom.xml ---------------------------------------------------------------------- diff --cc examples/flexjs/pom.xml index d374790,bffa25d..2dd2455 --- a/examples/flexjs/pom.xml +++ b/examples/flexjs/pom.xml @@@ -100,9 -98,8 +98,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Core</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -114,9 -111,8 +112,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Language</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -128,9 -124,8 +126,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>HTML</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -142,9 -137,8 +140,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Collections</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -156,9 -150,8 +154,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Binding</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <type>swc</type> + <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@@ -170,9 -163,8 +168,9 @@@ <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Graphics</artifactId> - <version>0.8.0-SNAPSHOT</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/43a696c2/frameworks/projects/Basic/src/main/flex/BasicClasses.as ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/43a696c2/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/43a696c2/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/43a696c2/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ContainerView.as ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/43a696c2/frameworks/projects/Basic/src/main/resources/basic-manifest.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/43a696c2/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 0bdc8c1,b63db1a..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 @@@ -593,40 -606,29 +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 @@@ -643,19 -645,15 +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() + @@@ -664,41 -662,8 +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 @@@ -739,8 -704,16 +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 @@@ -774,9 -748,11 +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'; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/43a696c2/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as ----------------------------------------------------------------------