[royale-compiler] 02/04: Revert "[maven-release-plugin] prepare release org.apache.royale.compiler-0.9.7-rc2"
This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit f6811eb7bda7b0a6aa0ec4d5b51809bf9a68c7ac Author: Alex Harui AuthorDate: Fri Apr 24 21:35:45 2020 -0700 Revert "[maven-release-plugin] prepare release org.apache.royale.compiler-0.9.7-rc2" This reverts commit 85b765c7d5ea8849360f937e4f65aee59dd12404. --- compiler-common/pom.xml | 43 ++--- compiler-externc/pom.xml | 53 compiler-jx/pom.xml | 53 compiler-test-utils/pom.xml | 43 ++--- compiler/pom.xml | 89 +-- debugger/pom.xml | 53 flex-compiler-oem/pom.xml| 49 +++ pom.xml | 141 ++- royale-ant-tasks/pom.xml | 43 ++--- royale-maven-plugin/pom.xml | 43 ++--- royaleunit-ant-tasks/pom.xml | 43 ++--- swfutils/pom.xml | 43 ++--- 12 files changed, 354 insertions(+), 342 deletions(-) diff --git a/compiler-common/pom.xml b/compiler-common/pom.xml index 4b30770..7a4274a 100644 --- a/compiler-common/pom.xml +++ b/compiler-common/pom.xml @@ -1,32 +1,33 @@ -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.royale.compiler royale-compiler-parent -0.9.7 +0.9.7-SNAPSHOT compiler-common -0.9.7 +0.9.7-SNAPSHOT Apache Royale: Compiler: Compiler-Common The Apache Royale Compiler Common classes @@ -69,4 +70,4 @@ -2020-04-24T07:11:17Z + diff --git a/compiler-externc/pom.xml b/compiler-externc/pom.xml index 1c73e0e..41d575c 100644 --- a/compiler-externc/pom.xml +++ b/compiler-externc/pom.xml @@ -1,32 +1,33 @@ -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.royale.compiler royale-compiler-parent -0.9.7 +0.9.7-SNAPSHOT compiler-externc - 0.9.7 + 0.9.7-SNAPSHOT Apache Royale: Compiler: Externc The Apache Royale Compiler Externs Compiler @@ -49,9 +50,9 @@ - @@ -242,7 +243,7 @@ org.apache.royale.compiler compiler-common - 0.9.7 + 0.9.7-SNAPSHOT com.google.javascript @@ -253,7 +254,7 @@ org.apache.royale.compiler compiler-test-utils - 0.9.7 + 0.9.7-SNAPSHOT test @@ -265,4 +266,4 @@ -2020-04-24T07:11:17Z + diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml index 5f7f500..4e8ac44 100644 --- a/compiler-jx/pom.xml +++ b/compiler-jx/pom.xml @@ -1,32 +1,33 @@ -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.royale.compiler royale-compiler-parent -0.9.7 +0.9.7-SNAPSHOT compiler-jx - 0.9.7 + 0.9.7-SNAPSHOT Apache Royale: Compiler: Compiler-JX @@ -178,17 +179,17 @@ org.apache.royale.compiler compiler-common - 0.9.7 + 0.9.7-SNAPSHOT org.apache.royale.compiler compiler-externc - 0.9.7 + 0.9.7-SNAPSHOT org.apache.royale.compiler compiler - 0.9.7 + 0.9.7-SNAPSHOT org.apache.commons @@ -220,7 +221,7 @@ org.apache.royale.compiler compiler-test-utils - 0.9.7 + 0.9.7-SNAPSHOT test @@ -232,11 +233,11 @@ org.apache.royale.compiler compiler-externc - 0.9.7 + 0.9.7-SNAPSHOT test-jar test -2020-04-24T07:11:17Z + diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml index 1c3f2cf..b569fe7 100644 --- a/compiler-test-utils/pom.xml +++ b/compiler-test-utils/pom.xml @@ -1,32 +1,33 @@
[royale-compiler] branch release/0.9.7 updated (f6859a1 -> ce1c52b)
This is an automated email from the ASF dual-hosted git repository. aharui pushed a change to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-compiler.git. from f6859a1 [maven-release-plugin] prepare for next development iteration new bd1f533 Revert "[maven-release-plugin] prepare for next development iteration" new f6811eb Revert "[maven-release-plugin] prepare release org.apache.royale.compiler-0.9.7-rc2" new 28e3583 fix spelling new ce1c52b try to fix differences in createjs and js where params without jsdoc had appended to the name and the n could be different The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CONTRIBUTORS.md| 2 +- compiler-common/pom.xml| 43 +++ compiler-externc/pom.xml | 53 .../codegen/typedefs/utils/FunctionUtils.java | 6 +- compiler-jx/pom.xml| 53 compiler-test-utils/pom.xml| 43 +++ compiler/pom.xml | 89 ++--- debugger/pom.xml | 53 flex-compiler-oem/pom.xml | 49 pom.xml| 137 +++-- royale-ant-tasks/pom.xml | 43 +++ royale-maven-plugin/pom.xml| 41 +++--- royaleunit-ant-tasks/pom.xml | 43 +++ swfutils/pom.xml | 43 +++ 14 files changed, 357 insertions(+), 341 deletions(-)
[royale-compiler] 01/04: Revert "[maven-release-plugin] prepare for next development iteration"
This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit bd1f533f7e213d9927a35240751f4e82fd2a9e1e Author: Alex Harui AuthorDate: Fri Apr 24 21:35:31 2020 -0700 Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit f6859a14bdc61b70eb54fc52aef1dfb46a55986d. --- compiler-common/pom.xml | 6 +++--- compiler-externc/pom.xml | 10 +- compiler-jx/pom.xml | 16 compiler-test-utils/pom.xml | 6 +++--- compiler/pom.xml | 12 ++-- debugger/pom.xml | 10 +- flex-compiler-oem/pom.xml| 12 ++-- pom.xml | 6 +++--- royale-ant-tasks/pom.xml | 6 +++--- royale-maven-plugin/pom.xml | 6 +++--- royaleunit-ant-tasks/pom.xml | 6 +++--- swfutils/pom.xml | 6 +++--- 12 files changed, 51 insertions(+), 51 deletions(-) diff --git a/compiler-common/pom.xml b/compiler-common/pom.xml index c081469..4b30770 100644 --- a/compiler-common/pom.xml +++ b/compiler-common/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.8-SNAPSHOT +0.9.7 compiler-common -0.9.8-SNAPSHOT +0.9.7 Apache Royale: Compiler: Compiler-Common The Apache Royale Compiler Common classes @@ -69,4 +69,4 @@ - +2020-04-24T07:11:17Z diff --git a/compiler-externc/pom.xml b/compiler-externc/pom.xml index 59212d8..1c73e0e 100644 --- a/compiler-externc/pom.xml +++ b/compiler-externc/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.8-SNAPSHOT +0.9.7 compiler-externc - 0.9.8-SNAPSHOT + 0.9.7 Apache Royale: Compiler: Externc The Apache Royale Compiler Externs Compiler @@ -242,7 +242,7 @@ org.apache.royale.compiler compiler-common - 0.9.8-SNAPSHOT + 0.9.7 com.google.javascript @@ -253,7 +253,7 @@ org.apache.royale.compiler compiler-test-utils - 0.9.8-SNAPSHOT + 0.9.7 test @@ -265,4 +265,4 @@ - +2020-04-24T07:11:17Z diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml index 84b18b4..5f7f500 100644 --- a/compiler-jx/pom.xml +++ b/compiler-jx/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.8-SNAPSHOT +0.9.7 compiler-jx - 0.9.8-SNAPSHOT + 0.9.7 Apache Royale: Compiler: Compiler-JX @@ -178,17 +178,17 @@ org.apache.royale.compiler compiler-common - 0.9.8-SNAPSHOT + 0.9.7 org.apache.royale.compiler compiler-externc - 0.9.8-SNAPSHOT + 0.9.7 org.apache.royale.compiler compiler - 0.9.8-SNAPSHOT + 0.9.7 org.apache.commons @@ -220,7 +220,7 @@ org.apache.royale.compiler compiler-test-utils - 0.9.8-SNAPSHOT + 0.9.7 test @@ -232,11 +232,11 @@ org.apache.royale.compiler compiler-externc - 0.9.8-SNAPSHOT + 0.9.7 test-jar test - +2020-04-24T07:11:17Z diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml index e54b61c..1c3f2cf 100644 --- a/compiler-test-utils/pom.xml +++ b/compiler-test-utils/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.8-SNAPSHOT +0.9.7 compiler-test-utils - 0.9.8-SNAPSHOT + 0.9.7 Apache Royale: Compiler: Test Utils @@ -51,4 +51,4 @@ - +2020-04-24T07:11:17Z diff --git a/compiler/pom.xml b/compiler/pom.xml index cf1c584..b398bd5 100644 --- a/compiler/pom.xml +++ b/compiler/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.8-SNAPSHOT +0.9.7 compiler - 0.9.8-SNAPSHOT + 0.9.7 Apache Royale: Compiler: Compiler The Apache Royale Compiler @@ -552,7 +552,7 @@ org.apache.royale.compiler compiler-common - 0.9.8-SNAPSHOT + 0.9.7 org.apache.flex @@ -604,13 +604,13 @@ org.apache.royale.compiler compiler-test-utils - 0.9.8-SNAPSHOT + 0.9.7 test org.apache.royale.compiler compiler-externc - 0.9.8-SNAPSHOT + 0.9.7 junit @@ -627,4 +627,4 @@ - +2020-04-24T07:11:17Z diff --git a/debugger/pom.xml b/debugger/pom.xml index 18abe0d..a94ec0a 100644 --- a/debugger/pom.xml +++ b/debugger/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.8-SNAPSHOT +0.9.7 debugger - 0.9.8-SNAPSHOT + 0.9.7 Apache Royale: Compiler: Debugger @@ -81,12 +81,12 @@ Do all the JBurg code generation.
[royale-compiler] 03/04: fix spelling
This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit 28e35831c5b600d1ec15627ca94992b185816d11 Author: Alex Harui AuthorDate: Fri Apr 24 21:36:38 2020 -0700 fix spelling --- CONTRIBUTORS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 4274b15..df3043c 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -25,7 +25,7 @@ * Alex Harui (https://github.com/aharui) * Omprakash Muppirala (https://github.com/bigosmallm) * Carlos Rovira (https://github.com/carlosrovira) - * Christopher Dutz (https://github.com/chrisdutz) + * Christofer Dutz (https://github.com/chrisdutz) * Cyrill Zadra (https://github.com/cyrillzadra) * Darrell Loverin (https://github.com/dloverin) * Frédéric Thomas (https://github.com/doublefx)
[royale-compiler] 04/04: try to fix differences in createjs and js where params without jsdoc had appended to the name and the n could be different
This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit ce1c52bc38e70413a4befb8ff904c424055c8df3 Author: Alex Harui AuthorDate: Fri Apr 24 22:48:50 2020 -0700 try to fix differences in createjs and js where params without jsdoc had appended to the name and the n could be different --- .../compiler/internal/codegen/typedefs/utils/FunctionUtils.java | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/utils/FunctionUtils.java b/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/utils/FunctionUtils.java index 50b884b..c2456dd 100644 --- a/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/utils/FunctionUtils.java +++ b/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/utils/FunctionUtils.java @@ -97,7 +97,11 @@ public class FunctionUtils { for (Node param : paramNode.children()) { -sb.append(param.getString()); + String name = param.getString(); + int c = name.indexOf("$jscomp$"); + if (c != -1) + name = name.substring(0, c); +sb.append(name); if (!outputJS) sb.append(":Object"); if (index < len - 1)
[royale-typedefs] annotated tag org.apache.royale.typedefs-0.9.7-rc2 updated (cb9b5a8 -> a7f09c5)
This is an automated email from the ASF dual-hosted git repository. aharui pushed a change to annotated tag org.apache.royale.typedefs-0.9.7-rc2 in repository https://gitbox.apache.org/repos/asf/royale-typedefs.git. *** WARNING: tag org.apache.royale.typedefs-0.9.7-rc2 was modified! *** from cb9b5a8 (commit) to a7f09c5 (tag) tagging cb9b5a837a741c0a4739eae48c360d2580323ee1 (commit) replaces apache-royale-0.9.6 by ApacheRoyaleCI on Sat Apr 25 04:47:50 2020 + - Log - [maven-release-plugin] copy for tag org.apache.royale.typedefs-0.9.7-rc2 --- No new revisions were added by this update. Summary of changes:
[royale-typedefs] branch release/0.9.7 updated (8e539a9 -> c342a46)
This is an automated email from the ASF dual-hosted git repository. aharui pushed a change to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-typedefs.git. from 8e539a9 Add all Contributors according to GitHub in GitHub ID alpha-order new cb9b5a8 [maven-release-plugin] prepare release org.apache.royale.typedefs-0.9.7-rc2 new c342a46 [maven-release-plugin] prepare for next development iteration The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: GCL/pom.xml | 45 cordova/pom.xml | 43 --- createjs/pom.xml| 325 ++-- google_maps/pom.xml | 43 --- jasmine/pom.xml | 43 --- jquery/pom.xml | 43 --- js/pom.xml | 49 node/pom.xml| 49 pom.xml | 76 ++-- 9 files changed, 353 insertions(+), 363 deletions(-)
[royale-typedefs] 02/02: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-typedefs.git commit c342a46407406e32e0e7b727c52386f1c54e31a4 Author: aharui AuthorDate: Sat Apr 25 04:47:57 2020 + [maven-release-plugin] prepare for next development iteration --- GCL/pom.xml | 8 cordova/pom.xml | 8 createjs/pom.xml| 8 google_maps/pom.xml | 8 jasmine/pom.xml | 8 jquery/pom.xml | 8 js/pom.xml | 6 +++--- node/pom.xml| 8 pom.xml | 6 +++--- 9 files changed, 34 insertions(+), 34 deletions(-) diff --git a/GCL/pom.xml b/GCL/pom.xml index 9a31184..dfd1e35 100644 --- a/GCL/pom.xml +++ b/GCL/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.typedefs royale-typedefs-parent -0.9.7 +0.9.8-SNAPSHOT royale-typedefs-gcl - 0.9.7 + 0.9.8-SNAPSHOT swc Apache Royale: TypeDefs: GCL @@ -50,11 +50,11 @@ org.apache.royale.typedefs royale-typedefs-js - 0.9.7 + 0.9.8-SNAPSHOT swc typedefs runtime -2020-04-25T04:46:42Z + diff --git a/cordova/pom.xml b/cordova/pom.xml index c6549fa..31ac214 100644 --- a/cordova/pom.xml +++ b/cordova/pom.xml @@ -22,18 +22,18 @@ org.apache.royale.typedefs royale-typedefs-parent -0.9.7 +0.9.8-SNAPSHOT royale-typedefs-cordova - 0.9.7 + 0.9.8-SNAPSHOT swc Apache Royale: TypeDefs: Cordova 4.11 - 2020-04-25T04:46:42Z + @@ -67,7 +67,7 @@ org.apache.royale.typedefs royale-typedefs-js - 0.9.7 + 0.9.8-SNAPSHOT swc typedefs runtime diff --git a/createjs/pom.xml b/createjs/pom.xml index c814546..0d5ea95 100644 --- a/createjs/pom.xml +++ b/createjs/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.typedefs royale-typedefs-parent -0.9.7 +0.9.8-SNAPSHOT royale-typedefs-createjs - 0.9.7 + 0.9.8-SNAPSHOT swc Apache Royale: TypeDefs: CreateJS @@ -34,7 +34,7 @@ 0.8.0 0.6.2 - 2020-04-25T04:46:42Z + @@ -230,7 +230,7 @@ org.apache.royale.typedefs royale-typedefs-js - 0.9.7 + 0.9.8-SNAPSHOT swc typedefs runtime diff --git a/google_maps/pom.xml b/google_maps/pom.xml index c487fbd..b58c8fd 100644 --- a/google_maps/pom.xml +++ b/google_maps/pom.xml @@ -22,18 +22,18 @@ org.apache.royale.typedefs royale-typedefs-parent -0.9.7 +0.9.8-SNAPSHOT royale-typedefs-googlemaps - 0.9.7 + 0.9.8-SNAPSHOT swc Apache Royale: TypeDefs: GoogleMaps v3_11 - 2020-04-25T04:46:42Z + @@ -88,7 +88,7 @@ org.apache.royale.typedefs royale-typedefs-js - 0.9.7 + 0.9.8-SNAPSHOT swc typedefs runtime diff --git a/jasmine/pom.xml b/jasmine/pom.xml index 31e4661..3a78f6d 100644 --- a/jasmine/pom.xml +++ b/jasmine/pom.xml @@ -22,18 +22,18 @@ org.apache.royale.typedefs royale-typedefs-parent -0.9.7 +0.9.8-SNAPSHOT royale-typedefs-jasmine - 0.9.7 + 0.9.8-SNAPSHOT swc Apache Royale: TypeDefs: Jasmine 2.0 - 2020-04-25T04:46:42Z + @@ -100,7 +100,7 @@ org.apache.royale.typedefs royale-typedefs-js - 0.9.7 + 0.9.8-SNAPSHOT swc typedefs runtime diff --git a/jquery/pom.xml b/jquery/pom.xml index c07a0cd..6e25fe1 100644 --- a/jquery/pom.xml +++ b/jquery/pom.xml @@ -22,18 +22,18 @@ org.apache.royale.typedefs royale-typedefs-parent -0.9.7 +0.9.8-SNAPSHOT royale-typedefs-jquery - 0.9.7 + 0.9.8-SNAPSHOT swc Apache Royale: TypeDefs: JQuery 1.9 - 2020-04-25T04:46:42Z + @@ -154,7 +154,7 @@ org.apache.royale.typedefs royale-typedefs-js - 0.9.7 + 0.9.8-SNAPSHOT swc typedefs runtime diff --git a/js/pom.xml b/js/pom.xml index 8c80173..b89090e 100644 --- a/js/pom.xml +++ b/js/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.typedefs royale-typedefs-parent -0.9.7 +0.9.8-SNAPSHOT royale-typedefs-js - 0.9.7 + 0.9.8-SNAPSHOT swc Apache Royale: TypeDefs: JS @@ -309,4 +309,4 @@ -2020-04-25T04:46:42Z + diff --git a/node/pom.xml b/node/pom.xml index a2da152..f8b5c98 100644 --- a/node/pom.xml +++ b/node/pom.xml @@ -22,18 +22,18 @@ org.apache.royale.typedefs royale-typedefs-parent -0.9.7 +0.9.8-SNAPSHOT royale-typedefs-node - 0.9.7 + 0.9.8-SNAPSHOT swc Apache Royale: TypeDefs: Node 20181210 - 2020-04-25T04:46:42Z + @@ -222,7 +222,7 @@ org.apache.royale.typedefs royale-typedefs-js - 0.9.7 + 0.9.8-SNAPSHOT swc typedefs
[royale-typedefs] 01/02: [maven-release-plugin] prepare release org.apache.royale.typedefs-0.9.7-rc2
This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-typedefs.git commit cb9b5a837a741c0a4739eae48c360d2580323ee1 Author: aharui AuthorDate: Sat Apr 25 04:47:50 2020 + [maven-release-plugin] prepare release org.apache.royale.typedefs-0.9.7-rc2 --- GCL/pom.xml | 45 cordova/pom.xml | 45 createjs/pom.xml| 327 ++-- google_maps/pom.xml | 45 jasmine/pom.xml | 45 jquery/pom.xml | 45 js/pom.xml | 49 node/pom.xml| 51 pom.xml | 80 +++-- 9 files changed, 361 insertions(+), 371 deletions(-) diff --git a/GCL/pom.xml b/GCL/pom.xml index e33c4fe..9a31184 100644 --- a/GCL/pom.xml +++ b/GCL/pom.xml @@ -1,33 +1,32 @@ - -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.royale.typedefs royale-typedefs-parent -0.9.7-SNAPSHOT +0.9.7 royale-typedefs-gcl - 0.9.7-SNAPSHOT + 0.9.7 swc Apache Royale: TypeDefs: GCL @@ -51,11 +50,11 @@ org.apache.royale.typedefs royale-typedefs-js - 0.9.7-SNAPSHOT + 0.9.7 swc typedefs runtime - +2020-04-25T04:46:42Z diff --git a/cordova/pom.xml b/cordova/pom.xml index 88bd238..c6549fa 100644 --- a/cordova/pom.xml +++ b/cordova/pom.xml @@ -1,40 +1,39 @@ - -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.royale.typedefs royale-typedefs-parent -0.9.7-SNAPSHOT +0.9.7 royale-typedefs-cordova - 0.9.7-SNAPSHOT + 0.9.7 swc Apache Royale: TypeDefs: Cordova 4.11 - + 2020-04-25T04:46:42Z @@ -68,7 +67,7 @@ org.apache.royale.typedefs royale-typedefs-js - 0.9.7-SNAPSHOT + 0.9.7 swc typedefs runtime diff --git a/createjs/pom.xml b/createjs/pom.xml index e6a43cb..c814546 100644 --- a/createjs/pom.xml +++ b/createjs/pom.xml @@ -1,33 +1,32 @@ - -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.royale.typedefs royale-typedefs-parent -0.9.7-SNAPSHOT +0.9.7 royale-typedefs-createjs - 0.9.7-SNAPSHOT + 0.9.7 swc Apache Royale: TypeDefs: CreateJS @@ -35,7 +34,7 @@ 0.8.0 0.6.2 - + 2020-04-25T04:46:42Z @@ -78,147 +77,147 @@ externs/createjs.js ../src/main/javascript/createjs.js - true @@ -231,7 +230,7 @@ org.apache.royale.typedefs royale-typedefs-js - 0.9.7-SNAPSHOT + 0.9.7 swc typedefs runtime diff --git a/google_maps/pom.xml b/google_maps/pom.xml index 31da5f3..c487fbd 100644 --- a/google_maps/pom.xml +++ b/google_maps/pom.xml @@ -1,40 +1,39 @@ - -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.royale.typedefs royale-typedefs-parent -0.9.7-SNAPSHOT +0.9.7 royale-typedefs-googlemaps - 0.9.7-SNAPSHOT + 0.9.7 swc Apache Royale: TypeDefs: GoogleMaps v3_11 - + 2020-04-25T04:46:42Z @@ -89,7 +88,7 @@ org.apache.royale.typedefs royale-typedefs-js - 0.9.7-SNAPSHOT + 0.9.7 swc typedefs runtime diff --git a/jasmine/pom.xml b/jasmine/pom.xml index dc27bb1..31e4661 100644 --- a/jasmine/pom.xml +++ b/jasmine/pom.xml @@ -1,40 +1,39 @@ - -http://maven.apache.org/POM/4.0.0;
[royale-typedefs] branch release/0.9.7 updated: Add all Contributors according to GitHub in GitHub ID alpha-order
This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-typedefs.git The following commit(s) were added to refs/heads/release/0.9.7 by this push: new 8e539a9 Add all Contributors according to GitHub in GitHub ID alpha-order 8e539a9 is described below commit 8e539a9b20fe013f8329fb16b6e45b80ddbdd2fa Author: Alex Harui AuthorDate: Fri Apr 24 21:32:07 2020 -0700 Add all Contributors according to GitHub in GitHub ID alpha-order --- CONTRIBUTORS.md | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index a1dd48c..23e322b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -21,6 +21,18 @@ Contributors - * Christopher Dutz (https://github.com/chrisdutz) + * Andrew Dufilie (https://github.com/adufilie) + * Alex Harui (https://github.com/aharui) + * Omprakash Muppirala (https://github.com/bigosmallm) + * Carlos Rovira (https://github.com/carlosrovira) + * Christofer Dutz (https://github.com/chrisdutz) + * Andrew Wetmore (https://github.com/cottage14) + * Frédéric Thomas (https://github.com/doublefx) + * Erik DeBruin (https://github.com/erikdebruin) + * Harbs (https://github.com/harbs) + * Josh Tynjala (https://github.com/joshtynjala) * Justin Mclean (https://github.com/justinmclean) - * Andrew Dufilie (https://github.com/adufilie) \ No newline at end of file + * Peter Ent (https://github.com/pentapache) + * Piotr Zarzycki (https://github.com/piotrzarzycki21) + * Yishay Weiss (https://github.com/yishayw) +
[royale-docs] branch master updated: Update mxml.md
This is an automated email from the ASF dual-hosted git repository. andreww pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-docs.git The following commit(s) were added to refs/heads/master by this push: new 704d3f7 Update mxml.md 704d3f7 is described below commit 704d3f74106bf0e17e9470f88b2041ccb61a69c2 Author: Andrew Wetmore AuthorDate: Fri Apr 24 19:56:48 2020 -0300 Update mxml.md Edits continue. --- features/mxml.md | 36 +--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/features/mxml.md b/features/mxml.md index 60ad776..0cf0f02 100644 --- a/features/mxml.md +++ b/features/mxml.md @@ -30,6 +30,13 @@ Most Royale applications have an MXML file as the main file in the app. It provi ``` + + + http://ns.adobe.com/mxml/2009; xmlns:j="library://ns.apache.org/royale/jewel" xmlns:html="library://ns.apache.org/royale/html"> @@ -65,11 +72,34 @@ Your main MXML file has two essential elements: **the header**: In the example above, the header tag `` has two parts: - **XML declaration**: this tells the compiler what version of XML the file is using. 1.0 is the default; but since other versions exist, you have to specify it. - - **The encoding**: this tells the compiler what text encoding to use to translate the bits of code into letters and numbers to displahy in the UI. The default is `utf-8`, but some applications use different encodings that suit their specific needs. + - **The encoding**: this tells the compiler what text encoding to use to translate the bits of code into letters and numbers to display in the UI. The default is `utf-8`, but some applications use different encodings that suit their specific needs. -**The main tag**: This tag includes everything else on the page. For a full application, it usually starts ``. +**The main tag**: This tag includes everything else on the page. For a full application, it usually starts ``. In the example above, which is for a module that could be included in a larger application, the main tag defines a group: ``. + +The main tag's **attributes** are very important for configuring and launching the application. The attributes can include: + + - the page's name, which may appear in a header bar or in metadata the browser displays. + - a declaration of **namespaces**. These are the location of resources you may want to use in the app. Declaring their namespaces means you can deploy a control, container, or some other neat thing from that namespace without much struggle. In the example above, because we declare the `xmlns:j="library://ns.apache.org/royale/jewel` in the main tag, we can later deploy buttons from that namespace (like ``) very simply. + - simple property values like the width and height of the app or module. + - if the app or module implements or inherits from some other app or module. + - what should happen as soon as the app is ready (something like `initialize="addEventListener('dataReady', dataReadyHandler);configurator.send()"`) -You write the rest of the page's contents within this tag, and the tag's attributes are very important for configuring and launching the application +You write what this file does, how it does it, and what the user sees as a result, after this main tag and before its closing tag at the end of the file. See the "What your file _may_ have" section, below. + +### What your file _should_ have ### + +It is good to add, just under the XML declaration line, a **comments block** that includes a copyright statement, license notice, author notice, a statement of the purpose of the file, and other information useful for future file maintenance. The file will compile and run just fine without such a statement; but if you are building code others will see, try to maintain, and possibly want to reuse, you should include it. ### What your file _may_ have ### + +A lot happens inside the main tag, and things can get complicated. The following elements to not all have to appear in every app or module, and do not have to appear in a specific order for the app to compile and run. But it's good to have a pattern you follow, especially if you are working as part of a team, so you can avoid wasting time trying to find something, forgetting to add something, or adding it twice. + +**Declarations**: Define things like effects, validators, and formatters, and send and request data, inside the `...` tag. + +**Metadata**: Add additional information to classes, properties, or methods to use at runtime inside the `...` tag. https://apache.github.io/royale-docs/features/as3/metadata;>Learn more. + +**Functions, property definitions, and other features**: Declare properties, instantiate components, and write functions inside the `...` tag. In the example above, we declare an event handler, a function that does things when you click one of the buttons in
[royale-asjs] branch develop updated: searchforlist: fix to manage correctly hidden items with keys
This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/develop by this push: new d0d6504 searchforlist: fix to manage correctly hidden items with keys d0d6504 is described below commit d0d65040f304986c7871439ca8447e70fec9f515 Author: Carlos Rovira AuthorDate: Fri Apr 24 21:41:36 2020 +0200 searchforlist: fix to manage correctly hidden items with keys --- .../controls/textinput/SearchFilterForList.as | 128 ++--- 1 file changed, 109 insertions(+), 19 deletions(-) diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as index fd393d6..e538d1e 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as @@ -19,13 +19,20 @@ package org.apache.royale.jewel.beads.controls.textinput { import org.apache.royale.core.Bead; + import org.apache.royale.core.IBeadKeyController; + import org.apache.royale.core.IFocusable; + import org.apache.royale.core.IItemRendererOwnerView; + import org.apache.royale.core.IRemovableBead; import org.apache.royale.core.IStrand; import org.apache.royale.events.Event; import org.apache.royale.events.KeyboardEvent; + import org.apache.royale.html.beads.IListView; import org.apache.royale.html.util.getLabelFromData; import org.apache.royale.jewel.List; + import org.apache.royale.jewel.beads.views.IScrollToIndexView; import org.apache.royale.jewel.itemRenderers.ListItemRenderer; import org.apache.royale.jewel.supportClasses.textinput.TextInputBase; + import org.apache.royale.utils.sendEvent; /** * The SearchFilterForList bead class is a specialty bead that can be used with @@ -66,11 +73,56 @@ package org.apache.royale.jewel.beads.controls.textinput public function set list(value:List):void { + if(_list) + { + list.removeEventListener(KeyboardEvent.KEY_DOWN, keyEventHandler, true); + } + _list = value; - if(_list != null) + if(_list) + { + var keyBead:IRemovableBead = _list.getBeadByType(IBeadKeyController) as IRemovableBead; + if(keyBead) + { + keyBead.tearDown(); + _list.removeBead(keyBead); + } + list.addEventListener(KeyboardEvent.KEY_DOWN, keyEventHandler, true); + } + } + + protected function keyEventHandler(event:KeyboardEvent):void + { + // avoid Tab loose the normal behaviour, for navigation we don't want build int scrolling support in browsers + if(event.key === KeyboardEvent.KEYCODE__TAB) + return; + + event.preventDefault(); + + var index:int = visibleIndexes.indexOf(list.selectedIndex); + currentIndex = index; + + if(event.key === KeyboardEvent.KEYCODE__UP || event.key === KeyboardEvent.KEYCODE__LEFT) + { + if(index > 0) + currentIndex = prevIndex; + } + else if(event.key === KeyboardEvent.KEYCODE__DOWN || event.key === KeyboardEvent.KEYCODE__RIGHT) + { + currentIndex = nextIndex; + } + + if(index != currentIndex) { - length = list.numElements; + list.selectedItem = list.dataProvider.getItemAt(currentIndex); + + var fir:IFocusable = (list.view as IListView).dataGroup.getItemRendererForIndex(currentIndex) as IFocusable; + fir.setFocus(); + +(list.view as IScrollToIndexView).scrollToIndex(index); + + sendEvent(list, 'change'); } } @@ -95,12 +147,6 @@ package
[MAVEN-BUILD] Royale-typedefs - Build # 2471 - Failure
The Apache Jenkins build system has built Royale-typedefs (build #2471) Status: Failure Check console output at https://builds.apache.org/job/Royale-typedefs/2471/ to view the results.
[royale-asjs] branch develop updated: jewel-ListKeyDownController: make IRemovableBead
This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/develop by this push: new b4de72b jewel-ListKeyDownController: make IRemovableBead b4de72b is described below commit b4de72b486fc396adaae637ace7b8822ed235309 Author: Carlos Rovira AuthorDate: Fri Apr 24 20:27:44 2020 +0200 jewel-ListKeyDownController: make IRemovableBead --- .../beads/controllers/ListKeyDownController.as | 24 -- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as index 50a306b..5feefe7 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as @@ -21,8 +21,10 @@ package org.apache.royale.jewel.beads.controllers import org.apache.royale.core.Bead; import org.apache.royale.core.IBeadKeyController; import org.apache.royale.core.IFocusable; + import org.apache.royale.core.IRemovableBead; import org.apache.royale.core.ISelectionModel; import org.apache.royale.core.IStrand; + import org.apache.royale.events.IEventDispatcher; import org.apache.royale.events.KeyboardEvent; import org.apache.royale.html.beads.IListView; import org.apache.royale.jewel.beads.views.IScrollToIndexView; @@ -46,7 +48,7 @@ package org.apache.royale.jewel.beads.controllers * @playerversion AIR 2.6 * @productversion Royale 0.9.7 */ - public class ListKeyDownController extends Bead implements IBeadKeyController + public class ListKeyDownController extends Bead implements IBeadKeyController, IRemovableBead { /** * Constructor. @@ -101,6 +103,19 @@ package org.apache.royale.jewel.beads.controllers listenOnStrand(KeyboardEvent.KEY_DOWN, keyEventHandler); } + /** +* The actions needed before the removal +* +* @langversion 3.0 +* @playerversion Flash 10.2 +* @playerversion AIR 2.6 +* @productversion Royale 0.9.8 +*/ + public function tearDown():void + { + IEventDispatcher(_strand).removeEventListener(KeyboardEvent.KEY_DOWN, keyEventHandler); + } + /** * @private */ @@ -129,11 +144,8 @@ package org.apache.royale.jewel.beads.controllers listModel.selectedItem = listModel.dataProvider.getItemAt(listModel.selectedIndex); var ir:IFocusable = listView.dataGroup.getItemRendererForIndex(listModel.selectedIndex) as IFocusable; - if(ir) - ir.setFocus(); - else - trace("!! " + listModel.selectedIndex); - + ir.setFocus(); + (listView as IScrollToIndexView).scrollToIndex(index); sendEvent(listView.host, 'change');
[royale-asjs] branch develop updated: core: add IRemovableBead with tearDown method for cleaning listeners before removal
This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/develop by this push: new e8e68d3 core: add IRemovableBead with tearDown method for cleaning listeners before removal e8e68d3 is described below commit e8e68d36811954e854744d8762973420eb229959 Author: Carlos Rovira AuthorDate: Fri Apr 24 20:26:43 2020 +0200 core: add IRemovableBead with tearDown method for cleaning listeners before removal --- .../projects/Core/src/main/royale/CoreClasses.as | 1 + .../org/apache/royale/core/IRemovableBead.as | 45 ++ 2 files changed, 46 insertions(+) diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as b/frameworks/projects/Core/src/main/royale/CoreClasses.as index 2d3e8c0..8a6c776 100644 --- a/frameworks/projects/Core/src/main/royale/CoreClasses.as +++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as @@ -26,6 +26,7 @@ package { */ internal class CoreClasses { + import org.apache.royale.core.IRemovableBead; IRemovableBead; import org.apache.royale.core.IBeadKeyController; IBeadKeyController; import org.apache.royale.core.IFocusable; IFocusable; import org.apache.royale.core.IId; IId; diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IRemovableBead.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IRemovableBead.as new file mode 100644 index 000..e3bf401 --- /dev/null +++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IRemovableBead.as @@ -0,0 +1,45 @@ + +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to You under the Apache License, Version 2.0 +// (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +package org.apache.royale.core +{ +/** + * The IRemovableBead interface is an interface for beads that + * need to do some work before beign removed from the strand calling tearDown method like + * clean listeners. + * + * @see org.apache.royale.core.IStrand#getBeadByType + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion Royale 0.9.8 + */ + public interface IRemovableBead extends IBead + { +/** +* The actions needed before the removal +* +* @langversion 3.0 +* @playerversion Flash 10.2 +* @playerversion AIR 2.6 +* @productversion Royale 0.9.8 +*/ +function tearDown():void; + } +}
[royale-asjs] branch develop updated: jewel-ListKeyDownController: fix a NPE when reach the end of a list
This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/develop by this push: new e6f6f69 jewel-ListKeyDownController: fix a NPE when reach the end of a list e6f6f69 is described below commit e6f6f693af81a52678a312b690c1a60505f0b50c Author: Carlos Rovira AuthorDate: Fri Apr 24 19:17:55 2020 +0200 jewel-ListKeyDownController: fix a NPE when reach the end of a list --- .../jewel/beads/controllers/ListKeyDownController.as | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as index 966cc8d..50a306b 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as @@ -117,20 +117,22 @@ package org.apache.royale.jewel.beads.controllers if(event.key === KeyboardEvent.KEYCODE__UP || event.key === KeyboardEvent.KEYCODE__LEFT) { if(index > 0) - index--; + listModel.selectedIndex--; } else if(event.key === KeyboardEvent.KEYCODE__DOWN || event.key === KeyboardEvent.KEYCODE__RIGHT) { - index++; + listModel.selectedIndex++; } if(index != listModel.selectedIndex) { - listModel.selectedIndex = index; - listModel.selectedItem = listModel.dataProvider.getItemAt(index); + listModel.selectedItem = listModel.dataProvider.getItemAt(listModel.selectedIndex); - var ir:IFocusable = listView.dataGroup.getItemRendererForIndex(index) as IFocusable; - ir.setFocus(); + var ir:IFocusable = listView.dataGroup.getItemRendererForIndex(listModel.selectedIndex) as IFocusable; + if(ir) + ir.setFocus(); + else + trace("!! " + listModel.selectedIndex); (listView as IScrollToIndexView).scrollToIndex(index);
[royale-asjs] branch develop updated: jewel-combobox: should solve an issue where click in popup scrollbar dissmiss the popup
This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 1028d17 jewel-combobox: should solve an issue where click in popup scrollbar dissmiss the popup 1028d17 is described below commit 1028d174f2c6f7f3f0ddc825a5ef50014e3339ae Author: Carlos Rovira AuthorDate: Fri Apr 24 19:01:37 2020 +0200 jewel-combobox: should solve an issue where click in popup scrollbar dissmiss the popup --- .../org/apache/royale/jewel/beads/controllers/ComboBoxController.as | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ComboBoxController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ComboBoxController.as index 4ae4cdb..f16b77a 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ComboBoxController.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ComboBoxController.as @@ -24,6 +24,7 @@ package org.apache.royale.jewel.beads.controllers } import org.apache.royale.core.IBeadController; import org.apache.royale.core.IComboBoxModel; + import org.apache.royale.core.IItemRenderer; import org.apache.royale.core.IItemRendererOwnerView; import org.apache.royale.core.IStrand; import org.apache.royale.events.Event; @@ -250,7 +251,8 @@ package org.apache.royale.jewel.beads.controllers */ private function listClickHandler(event:Event):void { - dismissPopUp(); + if(event.target is IItemRenderer) + dismissPopUp(); } protected function modelChangeHandler(event:Event):void{
[royale-asjs] branch develop updated: jewel-ListKeyDownController: convert to IBeadKeyController
This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/develop by this push: new e563a4a jewel-ListKeyDownController: convert to IBeadKeyController e563a4a is described below commit e563a4a8ae5cdb0761802f9030bfd7574beb6920 Author: Carlos Rovira AuthorDate: Fri Apr 24 18:54:48 2020 +0200 jewel-ListKeyDownController: convert to IBeadKeyController --- frameworks/projects/Jewel/src/main/resources/defaults.css | 1 + frameworks/projects/Jewel/src/main/royale/JewelClasses.as | 1 + .../Jewel/src/main/royale/org/apache/royale/jewel/List.as | 15 +-- .../jewel/beads/controllers/ListKeyDownController.as | 4 ++-- .../org/apache/royale/jewel/beads/views/ListView.as | 3 --- .../projects/Jewel/src/main/sass/components/_list.sass| 1 + 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css index eeed4a3..91972dc 100644 --- a/frameworks/projects/Jewel/src/main/resources/defaults.css +++ b/frameworks/projects/Jewel/src/main/resources/defaults.css @@ -3244,6 +3244,7 @@ j|Label { j|List { IBeadView: ClassReference("org.apache.royale.jewel.beads.views.ListView"); IBeadController: ClassReference("org.apache.royale.jewel.beads.controllers.ListSingleSelectionMouseController"); + IBeadKeyController: ClassReference("org.apache.royale.jewel.beads.controllers.ListKeyDownController"); IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout"); IItemRendererClassFactory: ClassReference("org.apache.royale.core.SelectableItemRendererClassFactory"); IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.ListItemRenderer"); diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as index c337bff..29c6ef5 100644 --- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as +++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as @@ -52,6 +52,7 @@ package import org.apache.royale.jewel.beads.controllers.DateFieldMouseController; DateFieldMouseController; import org.apache.royale.jewel.beads.controllers.AlertController; AlertController; import org.apache.royale.jewel.beads.controllers.ListSingleSelectionMouseController; ListSingleSelectionMouseController; +import org.apache.royale.jewel.beads.controllers.ListKeyDownController; ListKeyDownController; import org.apache.royale.jewel.beads.controllers.TableCellSelectionMouseController; TableCellSelectionMouseController; import org.apache.royale.jewel.beads.controllers.ComboBoxController; ComboBoxController; import org.apache.royale.jewel.beads.controllers.SnackbarController; SnackbarController; diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as index 08dadeb..f6a0cc0 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as @@ -19,16 +19,17 @@ package org.apache.royale.jewel { import org.apache.royale.core.IBead; + import org.apache.royale.core.IBeadKeyController; import org.apache.royale.core.IDataProviderModel; import org.apache.royale.core.IRollOverModel; import org.apache.royale.core.ISelectionModel; import org.apache.royale.core.IStrandWithPresentationModel; import org.apache.royale.jewel.beads.layouts.IVariableRowHeight; import org.apache.royale.jewel.beads.models.ListPresentationModel; + import org.apache.royale.jewel.beads.views.IScrollToIndexView; import org.apache.royale.jewel.supportClasses.container.DataContainerBase; import org.apache.royale.jewel.supportClasses.list.IListPresentationModel; - import org.apache.royale.jewel.beads.views.IScrollToIndexView; - import org.apache.royale.events.Event; + import org.apache.royale.utils.loadBeadFromValuesManager; /** * Indicates that the initialization of the list is complete. @@ -279,5 +280,15 @@ package org.apache.royale.jewel { return (view as IScrollToIndexView).scrollToIndex(index); } + + /** +* @private +*/ + override public function addedToParent():void + { + super.addedToParent(); + + loadBeadFromValuesManager(IBeadKeyController, "iBeadKeyController", this); + } } } diff --git
[royale-asjs] branch develop updated: Core: add IBeadKeyController
This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/develop by this push: new f40be40 Core: add IBeadKeyController f40be40 is described below commit f40be4071e1db52b9e323e6cf1b35e9674aa3b65 Author: Carlos Rovira AuthorDate: Fri Apr 24 18:53:24 2020 +0200 Core: add IBeadKeyController --- .../projects/Core/src/main/royale/CoreClasses.as | 1 + .../org/apache/royale/core/IBeadKeyController.as | 37 ++ 2 files changed, 38 insertions(+) diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as b/frameworks/projects/Core/src/main/royale/CoreClasses.as index 0910aa3..2d3e8c0 100644 --- a/frameworks/projects/Core/src/main/royale/CoreClasses.as +++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as @@ -26,6 +26,7 @@ package { */ internal class CoreClasses { + import org.apache.royale.core.IBeadKeyController; IBeadKeyController; import org.apache.royale.core.IFocusable; IFocusable; import org.apache.royale.core.IId; IId; import org.apache.royale.core.HTMLElementWrapper; HTMLElementWrapper; diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IBeadKeyController.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IBeadKeyController.as new file mode 100644 index 000..a38ce9f --- /dev/null +++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IBeadKeyController.as @@ -0,0 +1,37 @@ + +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to You under the Apache License, Version 2.0 +// (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +package org.apache.royale.core +{ +/** + * The IBeadKeyController interface is a "marker" interface for beads that + * are controllers. A marker interface has no addtional APIs. + * It is used to find the controller on the strand via calls to getBeadByType. + * + * @see org.apache.royale.core.IStrand#getBeadByType + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion Royale 0.9.8 + */ + public interface IBeadKeyController extends IBead + { + + } +}
[royale-asjs] branch develop updated: jewel-searchforlist: extend from Bead
This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 360dc06 jewel-searchforlist: extend from Bead 360dc06 is described below commit 360dc06789ecf1a9c920c8ffe12b3ac7c0f89055 Author: Carlos Rovira AuthorDate: Fri Apr 24 18:24:36 2020 +0200 jewel-searchforlist: extend from Bead --- .../beads/controls/textinput/SearchFilterForList.as | 19 ++- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as index d70bc69..fd393d6 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as @@ -18,10 +18,9 @@ package org.apache.royale.jewel.beads.controls.textinput { - import org.apache.royale.core.IBead; + import org.apache.royale.core.Bead; import org.apache.royale.core.IStrand; import org.apache.royale.events.Event; - import org.apache.royale.events.IEventDispatcher; import org.apache.royale.events.KeyboardEvent; import org.apache.royale.html.util.getLabelFromData; import org.apache.royale.jewel.List; @@ -41,7 +40,7 @@ package org.apache.royale.jewel.beads.controls.textinput * @playerversion AIR 2.6 * @productversion Royale 0.9.6 */ - public class SearchFilterForList implements IBead + public class SearchFilterForList extends Bead { /** * constructor. @@ -88,7 +87,6 @@ package org.apache.royale.jewel.beads.controls.textinput public var useDecoration:Boolean = true; private var _length:int; - /** * enables label decoration when filter */ @@ -104,7 +102,6 @@ package org.apache.royale.jewel.beads.controls.textinput } - protected var _strand:IStrand; /** * @copy org.apache.royale.core.IBead#strand * @@ -114,11 +111,11 @@ package org.apache.royale.jewel.beads.controls.textinput * @productversion Royale 0.9.6 * @royaleignorecoercion org.apache.royale.events.IEventDispatcher; */ - public function set strand(value:IStrand):void + override public function set strand(value:IStrand):void { _strand = value; - IEventDispatcher(_strand).addEventListener(KeyboardEvent.KEY_UP, keyUpHandler); -IEventDispatcher(_strand).addEventListener('beadsAdded', onBeadsAdded); + listenOnStrand(KeyboardEvent.KEY_UP, keyUpHandler); +listenOnStrand('beadsAdded', onBeadsAdded); } protected function keyUpHandler(event:KeyboardEvent):void @@ -141,10 +138,8 @@ package org.apache.royale.jewel.beads.controls.textinput { // first remove a previous selection if(list.selectedIndex != -1) - { list.selectedItem = null; - } - + applyFilter(input.text); } @@ -205,9 +200,7 @@ package org.apache.royale.jewel.beads.controls.textinput //stores the item if text is the same if(textData.toUpperCase() == filterText.toUpperCase()) - { item = ir.data; - } //decorate text if(useDecoration)
[royale-asjs] branch develop updated: jewel-list: decouple mouse controller from key controller
This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/develop by this push: new cae0fe6 jewel-list: decouple mouse controller from key controller cae0fe6 is described below commit cae0fe6cbadcbb06de3a56b86808af211cfe0a9c Author: Carlos Rovira AuthorDate: Fri Apr 24 18:21:50 2020 +0200 jewel-list: decouple mouse controller from key controller --- ...MouseController.as => ListKeyDownController.as} | 70 +++--- .../ListSingleSelectionMouseController.as | 49 --- .../apache/royale/jewel/beads/views/ListView.as| 3 + 3 files changed, 37 insertions(+), 85 deletions(-) diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListSingleSelectionMouseController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as similarity index 69% copy from frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListSingleSelectionMouseController.as copy to frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as index f6b273d..2ac03ff 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListSingleSelectionMouseController.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as @@ -18,13 +18,13 @@ package org.apache.royale.jewel.beads.controllers { + import org.apache.royale.core.Bead; + import org.apache.royale.core.IBeadController; import org.apache.royale.core.IFocusable; + import org.apache.royale.core.ISelectionModel; import org.apache.royale.core.IStrand; - import org.apache.royale.events.Event; - import org.apache.royale.events.IEventDispatcher; import org.apache.royale.events.KeyboardEvent; - import org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController; - import org.apache.royale.jewel.beads.models.IJewelSelectionModel; + import org.apache.royale.html.beads.IListView; import org.apache.royale.jewel.beads.views.IScrollToIndexView; import org.apache.royale.utils.sendEvent; @@ -44,9 +44,9 @@ package org.apache.royale.jewel.beads.controllers * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 - * @productversion Royale 0.9.4 + * @productversion Royale 0.9.7 */ - public class ListSingleSelectionMouseController extends org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController + public class ListKeyDownController extends Bead implements IBeadController { /** * Constructor. @@ -54,19 +54,39 @@ package org.apache.royale.jewel.beads.controllers * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 - * @productversion Royale 0.9.4 + * @productversion Royale 0.9.7 */ - public function ListSingleSelectionMouseController() + public function ListKeyDownController() { } + /** +* The model. +* +* @langversion 3.0 +* @playerversion Flash 10.2 +* @playerversion AIR 2.6 +* @productversion Royale 0.9.7 +*/ + protected var listModel:ISelectionModel; + + /** +* The view. +* +* @langversion 3.0 +* @playerversion Flash 10.2 +* @playerversion AIR 2.6 +* @productversion Royale 0.9.7 +*/ + protected var listView:IListView; + /** * @copy org.apache.royale.core.IBead#strand * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 - * @productversion Royale 0.9.4 + * @productversion Royale 0.9.7 * @royaleignorecoercion org.apache.royale.core.ISelectionModel * @royaleignorecoercion org.apache.royale.jewel.beads.models.IJewelSelectionModel * @royaleignorecoercion org.apache.royale.events.IEventDispatcher @@ -74,46 +94,24 @@ package org.apache.royale.jewel.beads.controllers */ override public function set strand(value:IStrand):void { - super.strand = value; - -IEventDispatcher(_strand).addEventListener(KeyboardEvent.KEY_DOWN, keyEventHandler); + _strand = value; +
[royale-asjs] branch develop updated: jewel-searchfilter: remove comments
This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 4416688 jewel-searchfilter: remove comments 4416688 is described below commit 441668826c42beef56eb17a423afb63a9b92c9aa Author: Carlos Rovira AuthorDate: Fri Apr 24 18:19:55 2020 +0200 jewel-searchfilter: remove comments --- .../org/apache/royale/jewel/beads/controls/combobox/SearchFilter.as | 4 1 file changed, 4 deletions(-) diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/SearchFilter.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/SearchFilter.as index b642de5..1027604 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/SearchFilter.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/SearchFilter.as @@ -59,11 +59,7 @@ package org.apache.royale.jewel.beads.controls.combobox var popUpVisible:Boolean = input.parent.view.popUpVisible; if (!popUpVisible) { -//force popup ?: input.parent.view.popUpVisible = true; - - //or avoid ?: -//return; } // fill "list" with the internal list in the combobox popup
[royale-asjs] branch develop updated: UIBase: simplify a var assignment
This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 26d2b8e UIBase: simplify a var assignment 26d2b8e is described below commit 26d2b8e0076e25af275d47140a0c586cc91bc5f8 Author: Carlos Rovira AuthorDate: Fri Apr 24 18:19:19 2020 +0200 UIBase: simplify a var assignment --- .../projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as| 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as index af47753..fd5a274 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as @@ -1303,8 +1303,7 @@ package org.apache.royale.core } COMPILE::JS { -var children:Array = internalChildren(); -return children.length; +return internalChildren().length; } }
[royale-docs] branch master updated: Update mxml.md
This is an automated email from the ASF dual-hosted git repository. andreww pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-docs.git The following commit(s) were added to refs/heads/master by this push: new 7a63360 Update mxml.md 7a63360 is described below commit 7a633602852678388b93de281e4f34f2774d65f5 Author: Andrew Wetmore AuthorDate: Fri Apr 24 10:20:51 2020 -0300 Update mxml.md edit in progress --- features/mxml.md | 18 +- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/features/mxml.md b/features/mxml.md index a2b31d2..60ad776 100644 --- a/features/mxml.md +++ b/features/mxml.md @@ -28,7 +28,7 @@ MXML is an XML-based language introduced in 2004 by Macromedia. In Royale you us Most Royale applications have an MXML file as the main file in the app. It provides the structure of the application. A simple main MXML file might look like this: -```mxml +``` http://ns.adobe.com/mxml/2009; xmlns:j="library://ns.apache.org/royale/jewel" @@ -57,3 +57,19 @@ Most Royale applications have an MXML file as the main file in the app. It provi ## What goes where ## The more complex the application is, the more things the main MXML file needs to be able to support and do. Typically, a developer organizes the file so it is easy to locate things in it. Some elements must be inside certain tags, and for others you have a lot of flexibility. However, if you are working in a team, it is good to have an agreement about what goes where so nobody wastes time or adds in code that already exists somewhere else in the file. + +### What your file _must_ have ### + +Your main MXML file has two essential elements: + +**the header**: In the example above, the header tag `` has two parts: + + - **XML declaration**: this tells the compiler what version of XML the file is using. 1.0 is the default; but since other versions exist, you have to specify it. + - **The encoding**: this tells the compiler what text encoding to use to translate the bits of code into letters and numbers to displahy in the UI. The default is `utf-8`, but some applications use different encodings that suit their specific needs. + + +**The main tag**: This tag includes everything else on the page. For a full application, it usually starts ``. + +You write the rest of the page's contents within this tag, and the tag's attributes are very important for configuring and launching the application + +### What your file _may_ have ###
[royale-docs] branch master updated: Update mxml.md
This is an automated email from the ASF dual-hosted git repository. andreww pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-docs.git The following commit(s) were added to refs/heads/master by this push: new 7a63360 Update mxml.md 7a63360 is described below commit 7a633602852678388b93de281e4f34f2774d65f5 Author: Andrew Wetmore AuthorDate: Fri Apr 24 10:20:51 2020 -0300 Update mxml.md edit in progress --- features/mxml.md | 18 +- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/features/mxml.md b/features/mxml.md index a2b31d2..60ad776 100644 --- a/features/mxml.md +++ b/features/mxml.md @@ -28,7 +28,7 @@ MXML is an XML-based language introduced in 2004 by Macromedia. In Royale you us Most Royale applications have an MXML file as the main file in the app. It provides the structure of the application. A simple main MXML file might look like this: -```mxml +``` http://ns.adobe.com/mxml/2009; xmlns:j="library://ns.apache.org/royale/jewel" @@ -57,3 +57,19 @@ Most Royale applications have an MXML file as the main file in the app. It provi ## What goes where ## The more complex the application is, the more things the main MXML file needs to be able to support and do. Typically, a developer organizes the file so it is easy to locate things in it. Some elements must be inside certain tags, and for others you have a lot of flexibility. However, if you are working in a team, it is good to have an agreement about what goes where so nobody wastes time or adds in code that already exists somewhere else in the file. + +### What your file _must_ have ### + +Your main MXML file has two essential elements: + +**the header**: In the example above, the header tag `` has two parts: + + - **XML declaration**: this tells the compiler what version of XML the file is using. 1.0 is the default; but since other versions exist, you have to specify it. + - **The encoding**: this tells the compiler what text encoding to use to translate the bits of code into letters and numbers to displahy in the UI. The default is `utf-8`, but some applications use different encodings that suit their specific needs. + + +**The main tag**: This tag includes everything else on the page. For a full application, it usually starts ``. + +You write the rest of the page's contents within this tag, and the tag's attributes are very important for configuring and launching the application + +### What your file _may_ have ###
[royale-asjs] annotated tag org.apache.royale.framework-0.9.7-rc2 updated (fd69c32 -> aa6889b)
This is an automated email from the ASF dual-hosted git repository. yishayw pushed a change to annotated tag org.apache.royale.framework-0.9.7-rc2 in repository https://gitbox.apache.org/repos/asf/royale-asjs.git. *** WARNING: tag org.apache.royale.framework-0.9.7-rc2 was modified! *** from fd69c32 (commit) to aa6889b (tag) tagging fd69c3283e1bc48f013c0ed7f72f994ae0891a37 (commit) replaces apache-royale-0.9.6 by ApacheRoyaleCI on Fri Apr 24 12:15:54 2020 + - Log - [maven-release-plugin] copy for tag org.apache.royale.framework-0.9.7-rc2 --- No new revisions were added by this update. Summary of changes:
[royale-asjs] branch release/0.9.7 updated (02c406b -> eee0fa7)
This is an automated email from the ASF dual-hosted git repository. yishayw pushed a change to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-asjs.git. from 02c406b move names to Contributors. Add all Contributors according to GitHub in GitHub ID alpha-order new fd69c32 [maven-release-plugin] prepare release org.apache.royale.framework-0.9.7-rc2 new eee0fa7 [maven-release-plugin] prepare for next development iteration The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: archetypes/pom.xml | 41 ++- .../royale-simple-application-archetype/pom.xml| 43 ++- .../pom.xml| 43 ++- .../pom.xml| 51 ++-- archetypes/royale-simple-library-archetype/pom.xml | 43 ++- archetypes/royale-simple-typedef-archetype/pom.xml | 43 ++- distribution/jars/compc/pom.xml| 43 ++- distribution/jars/compiler-asc/pom.xml | 43 ++- distribution/jars/compiler-compc/pom.xml | 43 ++- distribution/jars/compiler-compjsc/pom.xml | 47 ++- distribution/jars/compiler-mxmlc/pom.xml | 43 ++- distribution/jars/compiler-mxmljsc/pom.xml | 47 ++- distribution/jars/compiler-optimizer/pom.xml | 43 ++- distribution/jars/compiler-swfdump/pom.xml | 43 ++- distribution/jars/mxmlc/pom.xml| 43 ++- distribution/pom.xml | 333 ++--- examples/amf/SampleAmfWebApp/pom.xml | 100 +++ examples/amf/pom.xml | 43 ++- examples/blog/BE0001_Hello_World/pom.xml | 49 ++- .../blog/BE0002_Using_Jewel_Alert_Control/pom.xml | 53 ++-- .../blog/BE0003_Using_Jewel_Slider_Control/pom.xml | 53 ++-- .../BE0004_Adding_an_item_to_a_Jewel_List/pom.xml | 53 ++-- .../pom.xml| 53 ++-- .../pom.xml| 49 ++- .../pom.xml| 53 ++-- .../pom.xml| 53 ++-- .../pom.xml| 57 ++-- .../pom.xml| 49 ++- .../pom.xml| 53 ++-- .../pom.xml| 53 ++-- .../JewelModule/pom.xml| 45 ++- .../MainJewelApp/pom.xml | 43 ++- .../pom.xml| 53 ++-- .../BE0014_Working_with_vector_graphics/pom.xml| 57 ++-- examples/blog/pom.xml | 71 +++-- examples/crux/CruxGitHubCommitLogViewer/pom.xml| 61 ++-- examples/crux/CruxQuickStart/pom.xml | 49 ++- examples/crux/CruxQuickStartBasic/pom.xml | 49 ++- examples/crux/pom.xml | 85 +++--- examples/crux/todomvc-jewel-crux/pom.xml | 57 ++-- examples/examples-tests/pom.xml| 43 ++- examples/express/DataBindingExample/pom.xml| 47 ++- examples/express/DataGridExample/pom.xml | 47 ++- examples/express/GitHubCommitLogViewer/pom.xml | 49 ++- examples/express/pom.xml | 79 +++-- examples/jewel/TourDeJewel/pom.xml | 277 + examples/jewel/pom.xml | 73 +++-- examples/jewel/todomvc/pom.xml | 53 ++-- examples/mxroyale/ControlsExample/pom.xml | 45 ++- examples/mxroyale/HelloWorld/pom.xml | 45 ++- examples/mxroyale/RemoteObjectAMFTest/pom.xml | 55 ++-- examples/mxroyale/SparkHelloWorld/pom.xml | 45 ++- examples/mxroyale/pom.xml | 87 +++--- examples/native/ButtonExample/pom.xml | 51 ++-- examples/native/USStatesMap/pom.xml| 45 ++- examples/native/pom.xml| 51 ++-- examples/node/HelloWorld/pom.xml | 43 ++- examples/node/pom.xml | 51 ++-- examples/pom.xml | 45 ++- examples/royale/ASDoc/pom.xml | 59 ++-- examples/royale/AccordionExample/pom.xml | 59 ++-- examples/royale/AlertExample/pom.xml | 53 ++-- examples/royale/ChartExample/pom.xml | 57 ++-- examples/royale/CordovaCameraExample/pom.xml | 49 ++- examples/royale/CreateJSExample/pom.xml| 57 ++-- examples/royale/CreditCardValidatorExample/pom.xml | 47 ++- examples/royale/DataBindingExample/pom.xml | 53 ++--
[royale-asjs] branch release/0.9.7 updated: move names to Contributors. Add all Contributors according to GitHub in GitHub ID alpha-order
This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/release/0.9.7 by this push: new 02c406b move names to Contributors. Add all Contributors according to GitHub in GitHub ID alpha-order 02c406b is described below commit 02c406bdec14b48e6a738a6932554acd9c6f3fcc Author: Alex Harui AuthorDate: Fri Apr 24 00:43:34 2020 -0700 move names to Contributors. Add all Contributors according to GitHub in GitHub ID alpha-order --- CONTRIBUTORS.md | 29 ++--- RELEASE_NOTES.md | 2 +- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index abdda20..972456b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -21,17 +21,32 @@ Contributors + * Andrew Dufilie (https://github.com/adufilie) + * Alex Harui (https://github.com/aharui) + * Alina Kazi (https://github.com/alinakazi) + * Omprakash Muppirala (https://github.com/bigosmallm) + * Carlos Rovira (https://github.com/carlosrovira) * Christopher Dutz (https://github.com/chrisdutz) + * Andrew Wetmore (https://github.com/cottage14) + * Cristallium (https://github.com/cristallium) + * Frédéric Thomas (https://github.com/doublefx) + * doug777 (https://github.com/doug777) + * Erik DeBruin (https://github.com/erikdebruin) + * Greg Dove (https://github.com/greg-dove) + * Harbs (https://github.com/harbs) + * Jimmy Casey (https://github.com/jimmycasey) + * Josh Tynjala (https://github.com/joshtynjala) * Justin Mclean (https://github.com/justinmclean) + * Kevin Godell (https://github.com/kevinGodell) * LHR07-DBz (https://github.com/LHR07-DBz) - * yestaro (https://github.com/yestaro) * lizhi (https://github.com/matrix3d) - * Cristallium (https://github.com/cristallium) - * SAdelman (https://github.com/SAdelman) * MujtabaMughal (https://github.com/MujtabaMughal) - * Andrew Dufilie (https://github.com/adufilie) - * Kevin Godell (https://github.com/kevinGodell) - * Jimmy Casey (https://github.com/jimmycasey) - * doug777 (https://github.com/doug777) + * Olaf Krueger (https://github.com/olafkrueger) + * Pashmina Kazi (https://github.com/pashminakazi) + * Peter Ent (https://github.com/pentapache) + * Piotr Zarzycki (https://github.com/piotrzarzycki21) + * SAdelman (https://github.com/SAdelman) * Shoichiro Takeshita (https://github.com/T-San001) + * yestaro (https://github.com/yestaro) + * Yishay Weiss (https://github.com/yishayw) \ No newline at end of file diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 12f812a..2059997 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -73,7 +73,7 @@ Apache Royale 0.9.7 - New: - mx.net.SharedObjectJSON - new alternative - Maven: - - Massive improvements (thanks to Chris Dutz) + - Massive improvements - Now Maven can generate a valid distribution (SDK) to use in any IDE (tested on VSCode and Moonshine) - distribution can be JS only - SASS generation is now separated from main build to a profile to save lots of time when no need to build themes
[royale-compiler] 01/02: [maven-release-plugin] prepare release org.apache.royale.compiler-0.9.7-rc2
This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit 85b765c7d5ea8849360f937e4f65aee59dd12404 Author: aharui AuthorDate: Fri Apr 24 07:23:36 2020 + [maven-release-plugin] prepare release org.apache.royale.compiler-0.9.7-rc2 --- compiler-common/pom.xml | 43 +++-- compiler-externc/pom.xml | 53 compiler-jx/pom.xml | 53 compiler-test-utils/pom.xml | 43 +++-- compiler/pom.xml | 89 ++- debugger/pom.xml | 53 flex-compiler-oem/pom.xml| 49 --- pom.xml | 141 +-- royale-ant-tasks/pom.xml | 43 +++-- royale-maven-plugin/pom.xml | 43 +++-- royaleunit-ant-tasks/pom.xml | 43 +++-- swfutils/pom.xml | 43 +++-- 12 files changed, 342 insertions(+), 354 deletions(-) diff --git a/compiler-common/pom.xml b/compiler-common/pom.xml index 7a4274a..4b30770 100644 --- a/compiler-common/pom.xml +++ b/compiler-common/pom.xml @@ -1,33 +1,32 @@ - -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.royale.compiler royale-compiler-parent -0.9.7-SNAPSHOT +0.9.7 compiler-common -0.9.7-SNAPSHOT +0.9.7 Apache Royale: Compiler: Compiler-Common The Apache Royale Compiler Common classes @@ -70,4 +69,4 @@ - +2020-04-24T07:11:17Z diff --git a/compiler-externc/pom.xml b/compiler-externc/pom.xml index 41d575c..1c73e0e 100644 --- a/compiler-externc/pom.xml +++ b/compiler-externc/pom.xml @@ -1,33 +1,32 @@ - -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.royale.compiler royale-compiler-parent -0.9.7-SNAPSHOT +0.9.7 compiler-externc - 0.9.7-SNAPSHOT + 0.9.7 Apache Royale: Compiler: Externc The Apache Royale Compiler Externs Compiler @@ -50,9 +49,9 @@ - @@ -243,7 +242,7 @@ org.apache.royale.compiler compiler-common - 0.9.7-SNAPSHOT + 0.9.7 com.google.javascript @@ -254,7 +253,7 @@ org.apache.royale.compiler compiler-test-utils - 0.9.7-SNAPSHOT + 0.9.7 test @@ -266,4 +265,4 @@ - +2020-04-24T07:11:17Z diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml index 4e8ac44..5f7f500 100644 --- a/compiler-jx/pom.xml +++ b/compiler-jx/pom.xml @@ -1,33 +1,32 @@ - -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.royale.compiler royale-compiler-parent -0.9.7-SNAPSHOT +0.9.7 compiler-jx - 0.9.7-SNAPSHOT + 0.9.7 Apache Royale: Compiler: Compiler-JX @@ -179,17 +178,17 @@ org.apache.royale.compiler compiler-common - 0.9.7-SNAPSHOT + 0.9.7 org.apache.royale.compiler compiler-externc - 0.9.7-SNAPSHOT + 0.9.7 org.apache.royale.compiler compiler - 0.9.7-SNAPSHOT + 0.9.7 org.apache.commons @@ -221,7 +220,7 @@ org.apache.royale.compiler compiler-test-utils - 0.9.7-SNAPSHOT + 0.9.7 test @@ -233,11 +232,11 @@ org.apache.royale.compiler compiler-externc - 0.9.7-SNAPSHOT + 0.9.7 test-jar test - +2020-04-24T07:11:17Z diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml index b569fe7..1c3f2cf 100644 --- a/compiler-test-utils/pom.xml +++ b/compiler-test-utils/pom.xml @@ -1,33 +1,32 @@ - -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
[royale-compiler] annotated tag org.apache.royale.compiler-0.9.7-rc2 updated (85b765c -> d8714b2)
This is an automated email from the ASF dual-hosted git repository. aharui pushed a change to annotated tag org.apache.royale.compiler-0.9.7-rc2 in repository https://gitbox.apache.org/repos/asf/royale-compiler.git. *** WARNING: tag org.apache.royale.compiler-0.9.7-rc2 was modified! *** from 85b765c (commit) to d8714b2 (tag) tagging 85b765c7d5ea8849360f937e4f65aee59dd12404 (commit) replaces org.apache.royale.compiler-build-tools-1.2.0-rc3 by ApacheRoyaleCI on Fri Apr 24 07:23:37 2020 + - Log - [maven-release-plugin] copy for tag org.apache.royale.compiler-0.9.7-rc2 --- No new revisions were added by this update. Summary of changes:
[royale-compiler] 02/02: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit f6859a14bdc61b70eb54fc52aef1dfb46a55986d Author: aharui AuthorDate: Fri Apr 24 07:23:52 2020 + [maven-release-plugin] prepare for next development iteration --- compiler-common/pom.xml | 6 +++--- compiler-externc/pom.xml | 10 +- compiler-jx/pom.xml | 16 compiler-test-utils/pom.xml | 6 +++--- compiler/pom.xml | 12 ++-- debugger/pom.xml | 10 +- flex-compiler-oem/pom.xml| 12 ++-- pom.xml | 6 +++--- royale-ant-tasks/pom.xml | 6 +++--- royale-maven-plugin/pom.xml | 6 +++--- royaleunit-ant-tasks/pom.xml | 6 +++--- swfutils/pom.xml | 6 +++--- 12 files changed, 51 insertions(+), 51 deletions(-) diff --git a/compiler-common/pom.xml b/compiler-common/pom.xml index 4b30770..c081469 100644 --- a/compiler-common/pom.xml +++ b/compiler-common/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.7 +0.9.8-SNAPSHOT compiler-common -0.9.7 +0.9.8-SNAPSHOT Apache Royale: Compiler: Compiler-Common The Apache Royale Compiler Common classes @@ -69,4 +69,4 @@ -2020-04-24T07:11:17Z + diff --git a/compiler-externc/pom.xml b/compiler-externc/pom.xml index 1c73e0e..59212d8 100644 --- a/compiler-externc/pom.xml +++ b/compiler-externc/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.7 +0.9.8-SNAPSHOT compiler-externc - 0.9.7 + 0.9.8-SNAPSHOT Apache Royale: Compiler: Externc The Apache Royale Compiler Externs Compiler @@ -242,7 +242,7 @@ org.apache.royale.compiler compiler-common - 0.9.7 + 0.9.8-SNAPSHOT com.google.javascript @@ -253,7 +253,7 @@ org.apache.royale.compiler compiler-test-utils - 0.9.7 + 0.9.8-SNAPSHOT test @@ -265,4 +265,4 @@ -2020-04-24T07:11:17Z + diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml index 5f7f500..84b18b4 100644 --- a/compiler-jx/pom.xml +++ b/compiler-jx/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.7 +0.9.8-SNAPSHOT compiler-jx - 0.9.7 + 0.9.8-SNAPSHOT Apache Royale: Compiler: Compiler-JX @@ -178,17 +178,17 @@ org.apache.royale.compiler compiler-common - 0.9.7 + 0.9.8-SNAPSHOT org.apache.royale.compiler compiler-externc - 0.9.7 + 0.9.8-SNAPSHOT org.apache.royale.compiler compiler - 0.9.7 + 0.9.8-SNAPSHOT org.apache.commons @@ -220,7 +220,7 @@ org.apache.royale.compiler compiler-test-utils - 0.9.7 + 0.9.8-SNAPSHOT test @@ -232,11 +232,11 @@ org.apache.royale.compiler compiler-externc - 0.9.7 + 0.9.8-SNAPSHOT test-jar test -2020-04-24T07:11:17Z + diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml index 1c3f2cf..e54b61c 100644 --- a/compiler-test-utils/pom.xml +++ b/compiler-test-utils/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.7 +0.9.8-SNAPSHOT compiler-test-utils - 0.9.7 + 0.9.8-SNAPSHOT Apache Royale: Compiler: Test Utils @@ -51,4 +51,4 @@ -2020-04-24T07:11:17Z + diff --git a/compiler/pom.xml b/compiler/pom.xml index b398bd5..cf1c584 100644 --- a/compiler/pom.xml +++ b/compiler/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.7 +0.9.8-SNAPSHOT compiler - 0.9.7 + 0.9.8-SNAPSHOT Apache Royale: Compiler: Compiler The Apache Royale Compiler @@ -552,7 +552,7 @@ org.apache.royale.compiler compiler-common - 0.9.7 + 0.9.8-SNAPSHOT org.apache.flex @@ -604,13 +604,13 @@ org.apache.royale.compiler compiler-test-utils - 0.9.7 + 0.9.8-SNAPSHOT test org.apache.royale.compiler compiler-externc - 0.9.7 + 0.9.8-SNAPSHOT junit @@ -627,4 +627,4 @@ -2020-04-24T07:11:17Z + diff --git a/debugger/pom.xml b/debugger/pom.xml index a94ec0a..18abe0d 100644 --- a/debugger/pom.xml +++ b/debugger/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.7 +0.9.8-SNAPSHOT debugger - 0.9.7 + 0.9.8-SNAPSHOT Apache Royale: Compiler: Debugger @@ -81,12 +81,12 @@ Do all the JBurg code generation. org.apache.royale.compiler compiler - 0.9.7 + 0.9.8-SNAPSHOT
[royale-asjs] branch release/0.9.7 updated (6502fa0 -> 4c6617e)
This is an automated email from the ASF dual-hosted git repository. aharui pushed a change to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-asjs.git. from 6502fa0 add CONTRIBUTORS frist draft new 93eb0d7 Revert "[maven-release-plugin] prepare for next development iteration" new c6f00dc Revert "[maven-release-plugin] prepare release org.apache.royale.framework-0.9.7-rc2" new 4c6617e a third typo. 3 for 3 ;-( The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: archetypes/pom.xml | 41 +-- .../royale-simple-application-archetype/pom.xml| 43 +-- .../pom.xml| 43 +-- .../pom.xml| 51 ++-- archetypes/royale-simple-library-archetype/pom.xml | 43 +-- archetypes/royale-simple-typedef-archetype/pom.xml | 43 +-- distribution/jars/compc/pom.xml| 43 +-- distribution/jars/compiler-asc/pom.xml | 43 +-- distribution/jars/compiler-compc/pom.xml | 43 +-- distribution/jars/compiler-compjsc/pom.xml | 47 +-- distribution/jars/compiler-mxmlc/pom.xml | 43 +-- distribution/jars/compiler-mxmljsc/pom.xml | 47 +-- distribution/jars/compiler-optimizer/pom.xml | 43 +-- distribution/jars/compiler-swfdump/pom.xml | 43 +-- distribution/jars/mxmlc/pom.xml| 43 +-- distribution/pom.xml | 333 +++-- examples/amf/SampleAmfWebApp/pom.xml | 100 +++ examples/amf/pom.xml | 43 +-- examples/blog/BE0001_Hello_World/pom.xml | 49 +-- .../blog/BE0002_Using_Jewel_Alert_Control/pom.xml | 53 ++-- .../blog/BE0003_Using_Jewel_Slider_Control/pom.xml | 53 ++-- .../BE0004_Adding_an_item_to_a_Jewel_List/pom.xml | 53 ++-- .../pom.xml| 53 ++-- .../pom.xml| 49 +-- .../pom.xml| 53 ++-- .../pom.xml| 53 ++-- .../pom.xml| 57 ++-- .../pom.xml| 49 +-- .../pom.xml| 53 ++-- .../pom.xml| 53 ++-- .../JewelModule/pom.xml| 45 +-- .../MainJewelApp/pom.xml | 43 +-- .../pom.xml| 53 ++-- .../BE0014_Working_with_vector_graphics/pom.xml| 57 ++-- examples/blog/pom.xml | 71 ++--- examples/crux/CruxGitHubCommitLogViewer/pom.xml| 61 ++-- examples/crux/CruxQuickStart/pom.xml | 49 +-- examples/crux/CruxQuickStartBasic/pom.xml | 49 +-- examples/crux/pom.xml | 85 +++--- examples/crux/todomvc-jewel-crux/pom.xml | 57 ++-- examples/examples-tests/pom.xml| 43 +-- examples/express/DataBindingExample/pom.xml| 47 +-- examples/express/DataGridExample/pom.xml | 47 +-- examples/express/GitHubCommitLogViewer/pom.xml | 49 +-- examples/express/pom.xml | 79 ++--- examples/jewel/TourDeJewel/pom.xml | 277 - examples/jewel/pom.xml | 73 ++--- examples/jewel/todomvc/pom.xml | 53 ++-- examples/mxroyale/ControlsExample/pom.xml | 45 +-- examples/mxroyale/HelloWorld/pom.xml | 45 +-- examples/mxroyale/RemoteObjectAMFTest/pom.xml | 55 ++-- examples/mxroyale/SparkHelloWorld/pom.xml | 45 +-- examples/mxroyale/pom.xml | 87 +++--- examples/native/ButtonExample/pom.xml | 51 ++-- examples/native/USStatesMap/pom.xml| 45 +-- examples/native/pom.xml| 51 ++-- examples/node/HelloWorld/pom.xml | 43 +-- examples/node/pom.xml | 51 ++-- examples/pom.xml | 45 +-- examples/royale/ASDoc/pom.xml | 59 ++-- examples/royale/AccordionExample/pom.xml | 59 ++-- examples/royale/AlertExample/pom.xml | 53 ++-- examples/royale/ChartExample/pom.xml | 57 ++-- examples/royale/CordovaCameraExample/pom.xml | 49 +-- examples/royale/CreateJSExample/pom.xml| 57 ++-- examples/royale/CreditCardValidatorExample/pom.xml | 47 +-- examples/royale/DataBindingExample/pom.xml | 53 ++-- .../DataBindingExampleWithFlexLayout/pom.xml
[royale-compiler] branch release/0.9.7 updated: use java 8 time apis
This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-compiler.git The following commit(s) were added to refs/heads/release/0.9.7 by this push: new 9da4a2f use java 8 time apis 9da4a2f is described below commit 9da4a2fab07799d6e8cad83e45c1545ed2a61f15 Author: Alex Harui AuthorDate: Fri Apr 24 00:06:29 2020 -0700 use java 8 time apis --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1ee3dd9..7c6c105 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ -1.7 +1.8 UTF-8 UTF-8 3.3.1 @@ -348,7 +348,7 @@ animal-sniffer-maven-plugin -check-jdk-1.7 +check-jdk-1.8 test check @@ -356,7 +356,7 @@ org.codehaus.mojo.signature -java17 +java18 1.0
[royale-asjs] branch develop updated (f445b4d -> c7c7c6d)
This is an automated email from the ASF dual-hosted git repository. gregdove pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git. from f445b4d jewel-listview: maybe something to consider at somepoint new ed645b9 Ported support for ChangeWatcher.watch (without weakReference) new 5f10eb7 Fix for XMLList top level function should return the original when passed an XMLList instance new 843ba88 Add XMLList top level 'coercion' test. new 6898a43 Add test for XML literal interpolation new 030377a Merge branch 'develop' of https://github.com/apache/royale-asjs into develop new c7c7c6d Small change in Crux to cover both default (empty string key) and named ('event') argument for Bindable tags The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/royale/crux/binding/BindabilityInfo.as | 11 +- .../src/main/royale/mx/binding/BindabilityInfo.as | 179 +++-- .../main/royale/mx/binding/utils/ChangeWatcher.as | 56 +++ frameworks/projects/XML/src/main/royale/XMLList.as | 4 +- .../XML/src/test/royale/flexUnitTests/XMLTester.as | 2 + .../flexUnitTests/xml/XMLListTesterGeneralTest.as | 27 .../royale/flexUnitTests/xml/XMLLiteralTest.as | 127 +++ 7 files changed, 329 insertions(+), 77 deletions(-) create mode 100644 frameworks/projects/XML/src/test/royale/flexUnitTests/xml/XMLLiteralTest.as
[royale-asjs] 01/06: Ported support for ChangeWatcher.watch (without weakReference)
This is an automated email from the ASF dual-hosted git repository. gregdove pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit ed645b9806e82dcd43722d4640c95e41798d545f Author: greg-dove AuthorDate: Fri Apr 24 17:47:51 2020 +1200 Ported support for ChangeWatcher.watch (without weakReference) --- .../src/main/royale/mx/binding/BindabilityInfo.as | 179 +++-- .../main/royale/mx/binding/utils/ChangeWatcher.as | 56 +++ 2 files changed, 161 insertions(+), 74 deletions(-) diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/binding/BindabilityInfo.as b/frameworks/projects/MXRoyale/src/main/royale/mx/binding/BindabilityInfo.as index 8500fbe..ede40bf 100644 --- a/frameworks/projects/MXRoyale/src/main/royale/mx/binding/BindabilityInfo.as +++ b/frameworks/projects/MXRoyale/src/main/royale/mx/binding/BindabilityInfo.as @@ -20,8 +20,22 @@ package mx.binding { +COMPILE::SWF{ + import flash.utils.Dictionary; +} + import mx.events.PropertyChangeEvent; + +import org.apache.royale.events.ValueChangeEvent; +import org.apache.royale.reflection.DefinitionWithMetaData; +import org.apache.royale.reflection.MetaDataArgDefinition; +import org.apache.royale.reflection.MetaDataDefinition; +import org.apache.royale.reflection.TypeDefinition; +import org.apache.royale.reflection.describeType; +import org.apache.royale.reflection.utils.getMembersWithNameMatch; +import org.apache.royale.reflection.utils.filterForMetaTags; + [ExcludeClass] /** @@ -38,7 +52,7 @@ public class BindabilityInfo // Class constants // //-- - + /** * Name of [Bindable] metadata. * @@ -57,7 +71,7 @@ public class BindabilityInfo * @playerversion AIR 1.1 * @productversion Flex 3 */ - public static const MANAGED:String = "Managed"; +// public static const MANAGED:String = "Managed"; /** * Name of [ChangeEvent] metadata. @@ -67,7 +81,7 @@ public class BindabilityInfo * @playerversion AIR 1.1 * @productversion Flex 3 */ - public static const CHANGE_EVENT:String = "ChangeEvent"; +// public static const CHANGE_EVENT:String = "ChangeEvent"; /** * Name of [NonCommittingChangeEvent] metadata. @@ -77,8 +91,8 @@ public class BindabilityInfo * @playerversion AIR 1.1 * @productversion Flex 3 */ - public static const NON_COMMITTING_CHANGE_EVENT:String = - "NonCommittingChangeEvent"; + //public static const NON_COMMITTING_CHANGE_EVENT:String = + // "NonCommittingChangeEvent"; /** * Name of describeType() element. @@ -100,6 +114,50 @@ public class BindabilityInfo */ public static const METHOD:String = "method"; + + COMPILE::SWF + private static const cache:Dictionary = new Dictionary(); + + COMPILE::JS + private static const cache:Map = new Map() + + //-- + // + // Static methods + // + //-- + + public static function getCachedInfo(forTarget:Object):BindabilityInfo{ + var typeDef:TypeDefinition = describeType(forTarget); + var info:BindabilityInfo = getFromCache(typeDef); + if (!info) { + info = new BindabilityInfo(typeDef, true); + } + return info; + } + + private static function getFromCache(typeDef:TypeDefinition):BindabilityInfo{ + var info:BindabilityInfo; + COMPILE::SWF{ + info = cache[typeDef.getClass()] + } + COMPILE::JS{ + info = cache.get(typeDef.getClass()) + } + return info; + } + + private static function storeInCache(info:BindabilityInfo):void{ + var typeDef:TypeDefinition = info.typeDefinition; + COMPILE::SWF{ + cache[typeDef.getClass()] = info; + } + COMPILE::JS{ + cache.set(typeDef.getClass(), info); + } + } + + //-- // // Constructor @@ -114,11 +172,14 @@ public class BindabilityInfo * @playerversion AIR 1.1 * @productversion Flex 3 */ - public function BindabilityInfo(typeDescription:XML) + public function BindabilityInfo(typeDefinition:TypeDefinition, cache:Boolean=false) { super(); - this.typeDescription = typeDescription; +
[royale-asjs] 02/06: Fix for XMLList top level function should return the original when passed an XMLList instance
This is an automated email from the ASF dual-hosted git repository. gregdove pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit 5f10eb72c26b288cbcaeaa5db2e9f1cd184d83f4 Author: greg-dove AuthorDate: Fri Apr 24 17:49:34 2020 +1200 Fix for XMLList top level function should return the original when passed an XMLList instance --- frameworks/projects/XML/src/main/royale/XMLList.as | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frameworks/projects/XML/src/main/royale/XMLList.as b/frameworks/projects/XML/src/main/royale/XMLList.as index b2f9206..ea88105 100644 --- a/frameworks/projects/XML/src/main/royale/XMLList.as +++ b/frameworks/projects/XML/src/main/royale/XMLList.as @@ -34,9 +34,11 @@ package * mimics the top-level XMLList function (supports 'this' correctly) * * @royalesuppressexport +* @royaleignorecoercion XMLList */ public static function conversion(val:* = null):XMLList{ - return new XMLList(val); + if (val && val.constructor == XMLList) return val as XMLList; + else return new XMLList(val); } public function XMLList(expression:Object = null)
[royale-asjs] 04/06: Add test for XML literal interpolation
This is an automated email from the ASF dual-hosted git repository. gregdove pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit 6898a43cf12c4f856fc494d4140f09a3200e70b0 Author: greg-dove AuthorDate: Fri Apr 24 18:20:50 2020 +1200 Add test for XML literal interpolation --- .../XML/src/test/royale/flexUnitTests/XMLTester.as | 2 + .../royale/flexUnitTests/xml/XMLLiteralTest.as | 127 + 2 files changed, 129 insertions(+) diff --git a/frameworks/projects/XML/src/test/royale/flexUnitTests/XMLTester.as b/frameworks/projects/XML/src/test/royale/flexUnitTests/XMLTester.as index 17b01f1..8fa925c 100644 --- a/frameworks/projects/XML/src/test/royale/flexUnitTests/XMLTester.as +++ b/frameworks/projects/XML/src/test/royale/flexUnitTests/XMLTester.as @@ -49,6 +49,8 @@ package flexUnitTests public var xmlNamespaceQueries:XMLTesterNamespaceQueries; public var xmllistInterationTests:XMLListTesterIterationlTest; + +public var xmlLiteralTest:XMLLiteralTest; } } diff --git a/frameworks/projects/XML/src/test/royale/flexUnitTests/xml/XMLLiteralTest.as b/frameworks/projects/XML/src/test/royale/flexUnitTests/xml/XMLLiteralTest.as new file mode 100644 index 000..c5bbd65 --- /dev/null +++ b/frameworks/projects/XML/src/test/royale/flexUnitTests/xml/XMLLiteralTest.as @@ -0,0 +1,127 @@ + +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to You under the Apache License, Version 2.0 +// (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +package flexUnitTests.xml +{ + + +import org.apache.royale.test.asserts.*; + + +/** + * @royalesuppresspublicvarwarning + */ +public class XMLLiteralTest +{ +public static var isJS:Boolean = COMPILE::JS; + + +private var settings:Object; + + +[Before] +public function setUp():void +{ +settings = XML.settings(); +} + +[After] +public function tearDown():void +{ +XML.setSettings(settings); +} + +[BeforeClass] +public static function setUpBeforeClass():void +{ + +} + +[AfterClass] +public static function tearDownAfterClass():void +{ + +} + + +[Test] +public function testSimpleLiteral():void +{ +var xml1:XML = ; + +assertEquals( xml1.toXMLString(),'', 'unexpected result from simple XML literal roundtripping'); +} + + + + +[Test] +public function testLocalVarInsertion():void +{ +var test:String='testVal'; + +var xml1:XML = +{test} +; + +assertEquals( xml1.testVar.toString() , "testVal", 'toString value should be "testVal" '); + +} + +[Test] +public function testComplexInsertion():void +{ +var contentSource:ExternalSource = new ExternalSource(); + +var xml:XML = + +anything +{contentSource.stringVal + ' with appended literal string'} +{String(contentSource.boolVal)} +{contentSource.numVal} +{ExternalSource.getAValue()} + +; + +assertEquals( xml.toXMLString() , 'http://something;>\n' + +' \n' + +'anything\n' + +'stringVal with appended literal string\n' + +'true\n' + +'10\n' + +'ExternalSource.gotValue\n' + +' \n' + +'', 'unexpected result from XML literal complex insertion at construction'); + +} +} +} + +class ExternalSource{ + +public static function getAValue():String{ +return 'ExternalSource.gotValue'; +} + +public var
[royale-asjs] 03/06: Add XMLList top level 'coercion' test.
This is an automated email from the ASF dual-hosted git repository. gregdove pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit 843ba88365692e575a096d6f9ac06d01aa171848 Author: greg-dove AuthorDate: Fri Apr 24 18:18:19 2020 +1200 Add XMLList top level 'coercion' test. --- .../flexUnitTests/xml/XMLListTesterGeneralTest.as | 27 ++ 1 file changed, 27 insertions(+) diff --git a/frameworks/projects/XML/src/test/royale/flexUnitTests/xml/XMLListTesterGeneralTest.as b/frameworks/projects/XML/src/test/royale/flexUnitTests/xml/XMLListTesterGeneralTest.as index c9b9e6e..139dafd 100644 --- a/frameworks/projects/XML/src/test/royale/flexUnitTests/xml/XMLListTesterGeneralTest.as +++ b/frameworks/projects/XML/src/test/royale/flexUnitTests/xml/XMLListTesterGeneralTest.as @@ -216,5 +216,32 @@ package flexUnitTests.xml } assertTrue(hadError, 'expected an error'); } + + + +[Test] +public function testCoercion():void{ +var source:XML = + +item1 + + +item2 + +; + +var list:XMLList = XMLList(source); +assertEquals(list.length(), 1, 'unexpected XMLList length'); +assertEquals(source.row.length(), 2, 'unexpected XMLList length'); + +assertEquals(list.row.length(), 2, 'unexpected XMLList length'); +var alt:XMLList = XMLList(list) +assertEquals(alt.length(), 1, 'unexpected XMLList length'); +assertEquals(alt.row.length(), 2, 'unexpected XMLList length'); +assertEquals(alt, list, 'unexpected XMLList equality'); +assertStrictlyEquals(alt, list, 'unexpected XMLList strict equality'); +assertStrictlyEquals(alt[0], source, 'unexpected XMLList content strict equality'); + +} } }
[royale-asjs] 05/06: Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
This is an automated email from the ASF dual-hosted git repository. gregdove pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit 030377a16aef3c92198ae7a6904b871717cac627 Merge: 6898a43 f445b4d Author: greg-dove AuthorDate: Fri Apr 24 18:22:38 2020 +1200 Merge branch 'develop' of https://github.com/apache/royale-asjs into develop .../jewel/beads/controllers/ComboBoxController.as | 14 +- .../ListSingleSelectionMouseController.as | 21 +++-- .../org/apache/royale/jewel/beads/views/ListView.as | 11 +++ 3 files changed, 35 insertions(+), 11 deletions(-)
[royale-asjs] 06/06: Small change in Crux to cover both default (empty string key) and named ('event') argument for Bindable tags
This is an automated email from the ASF dual-hosted git repository. gregdove pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit c7c7c6df965682bfa1fc087566104cd4b491e5a8 Author: greg-dove AuthorDate: Fri Apr 24 18:26:11 2020 +1200 Small change in Crux to cover both default (empty string key) and named ('event') argument for Bindable tags --- .../royale/org/apache/royale/crux/binding/BindabilityInfo.as | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/binding/BindabilityInfo.as b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/binding/BindabilityInfo.as index f66319b..43cf71e 100644 --- a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/binding/BindabilityInfo.as +++ b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/binding/BindabilityInfo.as @@ -218,8 +218,15 @@ public class BindabilityInfo //if there is no arg, then it is valueChange for each(var metaItem:MetaDataDefinition in metaItems) { if (metaItem.args.length) { - //assume first arg is the eventName - eventListObj[MetaDataArgDefinition(metaItem.args[0]).value] = true; + //check for no key + var eventTypeArgs:Array = metaItem.getArgsByKey(''); + if (!eventTypeArgs.length) { + //check for 'event' key + eventTypeArgs = metaItem.getArgsByKey('event'); + } + if (eventTypeArgs.length) { + eventListObj[MetaDataArgDefinition(eventTypeArgs[0]).value] = true; + } } else { if (meta == BINDABLE) { eventListObj[ValueChangeEvent.VALUE_CHANGE] = true;
[royale-compiler] branch release/0.9.7 updated: another attempt at setting Zip timestamps
This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-compiler.git The following commit(s) were added to refs/heads/release/0.9.7 by this push: new 6fb62b1 another attempt at setting Zip timestamps 6fb62b1 is described below commit 6fb62b10c229dd97b922b09eaadb00dac0b668af Author: Alex Harui AuthorDate: Thu Apr 23 23:39:05 2020 -0700 another attempt at setting Zip timestamps --- .../apache/royale/compiler/clients/COMPJSC.java| 55 ++-- .../royale/compiler/clients/COMPJSCRoyale.java | 99 ++ .../java/org/apache/royale/swc/io/SWCWriter.java | 30 +++ 3 files changed, 70 insertions(+), 114 deletions(-) diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSC.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSC.java index 1e52a2c..2d42011 100644 --- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSC.java +++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSC.java @@ -28,6 +28,8 @@ import java.io.IOException; import java.io.InputStream; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.time.ZoneId; +import java.time.ZonedDateTime; import java.util.*; import java.util.zip.CRC32; import java.util.zip.Deflater; @@ -502,30 +504,15 @@ public class COMPJSC extends MXMLJSC String metadataFormat = targetSettings.getSWFMetadataDateFormat(); try { SimpleDateFormat sdf = new SimpleDateFormat(metadataFormat); - sdf.setTimeZone(TimeZone.getTimeZone("UTC")); - fileDate = sdf.parse(metadataDate).getTime(); - } catch (ParseException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IllegalArgumentException e1) { - e1.printStackTrace(); - } -// TODO: Fix this the same way that the compiler normalized the date -// strip off timezone. Zip format doesn't store timezone -// and the goal is to have the same date and time regardless -// of which timezone the build machine is using. -int c = metadataDate.lastIndexOf(' '); -if(c != -1) { -metadataDate = metadataDate.substring(0, c); -} -c = metadataFormat.lastIndexOf(' '); -if(c != -1) { -metadataFormat = metadataFormat.substring(0, c); -} - try { - SimpleDateFormat sdf = new SimpleDateFormat(metadataFormat); - sdf.setTimeZone(TimeZone.getTimeZone("UTC")); -zipFileDate = sdf.parse(metadataDate).getTime(); + Date d = sdf.parse(metadataDate); + Calendar cal = new GregorianCalendar(); + cal.setTime(d); + sdf.setTimeZone(TimeZone.getTimeZone("UTC")); + d = sdf.parse(metadataDate); + fileDate = d.getTime(); + ZonedDateTime zdt = ZonedDateTime.of(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH), + cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND), 0, ZoneId.systemDefault()); + zipFileDate = zdt.toInstant().toEpochMilli(); } catch (ParseException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -595,8 +582,15 @@ public class COMPJSC extends MXMLJSC String metadataFormat = targetSettings.getSWFMetadataDateFormat(); try {
[royale-compiler] branch release/0.9.7 updated: move names to Contributors. Add all Contributors according to GitHub in GitHub ID alpha-order
This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch release/0.9.7 in repository https://gitbox.apache.org/repos/asf/royale-compiler.git The following commit(s) were added to refs/heads/release/0.9.7 by this push: new fc898e0 move names to Contributors. Add all Contributors according to GitHub in GitHub ID alpha-order fc898e0 is described below commit fc898e0fc5b7b10021216588ffd6b04738ca637f Author: Alex Harui AuthorDate: Thu Apr 23 23:37:24 2020 -0700 move names to Contributors. Add all Contributors according to GitHub in GitHub ID alpha-order --- CONTRIBUTORS.md | 22 +- RELEASE_NOTES.md | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 50a6b71..4274b15 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -21,11 +21,23 @@ Contributors - * Christopher Dutz (https://github.com/chrisdutz) - * Justin Mclean (https://github.com/justinmclean) * Andrew Dufilie (https://github.com/adufilie) + * Alex Harui (https://github.com/aharui) + * Omprakash Muppirala (https://github.com/bigosmallm) + * Carlos Rovira (https://github.com/carlosrovira) + * Christopher Dutz (https://github.com/chrisdutz) * Cyrill Zadra (https://github.com/cyrillzadra) - * Daniel Loverin (https://github.com/dloverin) - * taorepoara (https://github.com/taorepoara) + * Darrell Loverin (https://github.com/dloverin) + * Frédéric Thomas (https://github.com/doublefx) + * Erik DeBruin (https://github.com/erikdebruin) + * Greg Dove (https://github.com/greg-dove) + * Harbs (https://github.com/harbs) + * Jimmy Casey (https://github.com/jimmycasey) + * Josh Tynjala (https://github.com/joshtynjala) + * Justin Mclean (https://github.com/justinmclean) * Nikolay Sukharev (https://github.com/mrchnk) - * Jimmy Casey (https://github.com/jimmycasey) \ No newline at end of file + * Peter Ent (https://github.com/pentapache) + * Piotr Zarzycki (https://github.com/piotrzarzycki21) + * taorepoara (https://github.com/taorepoara) + * Michael Schmalle (https://github.com/teotigraphix) + * Yishay Weiss (https://github.com/yishayw) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e774654..9eb9061 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -12,7 +12,7 @@ Apache Royale Compiler 0.9.7 - Fixed a [compiler memory leak](https://github.com/apache/royale-compiler/issues/117) that was occurring over multiple compilations - Fixes in bindable code generation for accessors, and in bindable function generation for swf - Fixed show-binding-warnings=false option to switch off binding warnings - - Maven: Many fixes, improvements and Updates (thanks to Christopher Dutz) + - Maven: Many fixes, improvements and Updates - Support for Maven distribution (Create SDK with Maven) - (JS) Prevent renaming of public variables in release builds so that they may be set from MXML. - (JS) Fix conflict between methods of the same name in superclass and subclass, where the superclass method is private and the subclass method is public.
[royale-compiler] branch develop updated: Fix an issue with invalid code-gen of certain XML literals with 'binding-like' value injections at construction
This is an automated email from the ASF dual-hosted git repository. gregdove pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-compiler.git The following commit(s) were added to refs/heads/develop by this push: new c3a5bbe Fix an issue with invalid code-gen of certain XML literals with 'binding-like' value injections at construction c3a5bbe is described below commit c3a5bbec0b3c6f195a8dec031d8623f5678c7101 Author: greg-dove AuthorDate: Fri Apr 24 17:28:10 2020 +1200 Fix an issue with invalid code-gen of certain XML literals with 'binding-like' value injections at construction --- .../compiler/internal/codegen/js/jx/LiteralEmitter.java | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java index 8a83b84..1883667 100644 --- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java +++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java @@ -60,6 +60,7 @@ public class LiteralEmitter extends JSSubEmitter implements String s = node.getValue(true); if (!(node instanceof RegExpLiteralNode)) { +boolean withEscapedSingleQuote = false; if (node.getLiteralType() == LiteralType.XML) { boolean jsx = false; @@ -110,10 +111,12 @@ public class LiteralEmitter extends JSSubEmitter implements { s = ((LiteralNode)child).getValue(true); s = s.replace("\n", ""); - if (s.contains("'")) - sb.append("\"" + s + "\""); - else - sb.append("'" + s + "'"); +if (s.contains("'")) { +s = s.replace("'","__ESC_SNGLE_QUOT_PLACEHOLDER__"); +withEscapedSingleQuote = true; +} + +sb.append("'" + s + "'"); } else { @@ -182,6 +185,7 @@ public class LiteralEmitter extends JSSubEmitter implements //s = "\'" + s.replaceAll("\'", "\'") + "\'"; s = s.replaceAll("__QUOTE_PLACEHOLDER__", "\""); s = s.replaceAll("__ESCAPE_PLACEHOLDER__", ""); +if (withEscapedSingleQuote) s = s.replaceAll("__ESC_SNGLE_QUOT_PLACEHOLDER__", "'"); s = s.replaceAll("__BACKSPACE_PLACEHOLDER__", "b"); s = s.replaceAll("__FORMFEED_PLACEHOLDER__", "f"); s = s.replaceAll("__TAB_PLACEHOLDER__", "t");