You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by gr...@apache.org on 2021/09/30 07:46:06 UTC
[royale-compiler] branch develop updated: Changes to fix
MXMLBooleanNode_with_id_attribute
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 55c2dad Changes to fix MXMLBooleanNode_with_id_attribute
55c2dad is described below
commit 55c2dad168ea8f6732e3b35c6f885c7d6c9564b9
Author: greg-dove <gr...@gmail.com>
AuthorDate: Thu Sep 30 20:45:01 2021 +1300
Changes to fix MXMLBooleanNode_with_id_attribute
---
.../royale/compiler/internal/projects/RoyaleProjectConfigurator.java | 2 ++
.../apache/royale/compiler/internal/tree/mxml/MXMLInstanceNode.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProjectConfigurator.java b/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProjectConfigurator.java
index e9dc454..2eca5f9 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProjectConfigurator.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProjectConfigurator.java
@@ -190,6 +190,8 @@ public class RoyaleProjectConfigurator extends Configurator
project.setRepeaterClass(IMXMLTypeConstants.Repeater);
project.setNamedColors(NAMED_COLORS);
+
+ project.setMXMLForceLocalId(false);
if (configuration != null)
{
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLInstanceNode.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLInstanceNode.java
index c1f6fc2..ab9146d 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLInstanceNode.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLInstanceNode.java
@@ -215,8 +215,9 @@ public class MXMLInstanceNode extends MXMLClassReferenceNodeBase implements IMXM
MXMLNodeInfo info)
{
if (attribute.isSpecialAttribute(ATTRIBUTE_ID)) {
- if (builder.getProject().getMXMLForceLocalId())
+ if (builder.getProject().getMXMLForceLocalId()) {
localId = processIDAttribute(builder, attribute);
+ }
else
id = processIDAttribute(builder, attribute);
}