You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2020/07/05 21:39:30 UTC
[royale-asjs] branch develop updated (0f282c9 -> df14ef9)
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from 0f282c9 Cleaned up casting
new 9d80aed Removed XML coercions
new df14ef9 cleaned up coercions
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:
.../src/main/royale/org/apache/royale/svg/beads/ImageView.as | 4 ++++
.../src/main/royale/org/apache/royale/utils/UIModuleUtils.as | 4 +++-
frameworks/projects/XML/src/main/royale/XML.as | 9 +++++++--
frameworks/projects/XML/src/main/royale/XMLList.as | 8 ++++++--
4 files changed, 20 insertions(+), 5 deletions(-)
[royale-asjs] 01/02: Removed XML coercions
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 9d80aed11874165ab11096c2e2168df413f9260a
Author: Harbs <ha...@in-tools.com>
AuthorDate: Mon Jul 6 00:38:46 2020 +0300
Removed XML coercions
---
frameworks/projects/XML/src/main/royale/XML.as | 9 +++++++--
frameworks/projects/XML/src/main/royale/XMLList.as | 8 ++++++--
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/frameworks/projects/XML/src/main/royale/XML.as b/frameworks/projects/XML/src/main/royale/XML.as
index 5acf21e..2dd7cf5 100644
--- a/frameworks/projects/XML/src/main/royale/XML.as
+++ b/frameworks/projects/XML/src/main/royale/XML.as
@@ -584,11 +584,12 @@ package
_value = '';
}
}
+ initializeClass();
if(!_class_initialized)
{
Object.defineProperty(XML.prototype,"0",
{
- "get": function():XML{return this as XML},
+ "get": function():*{return this},
"set": function():void{},
enumerable: true,
configurable: true
@@ -597,6 +598,10 @@ package
_class_initialized = true;
}
}
+ private static function initializeClass():void
+ {
+
+ }
private static var _class_initialized:Boolean = false;
@@ -2047,7 +2052,7 @@ package
* @param name
* @return
*
- * royaleignorecoercion XML
+ * @royaleignorecoercion XML
*/
public function processingInstructions(name:String = "*"):XMLList
{
diff --git a/frameworks/projects/XML/src/main/royale/XMLList.as b/frameworks/projects/XML/src/main/royale/XMLList.as
index ea88105..ba21f25 100644
--- a/frameworks/projects/XML/src/main/royale/XMLList.as
+++ b/frameworks/projects/XML/src/main/royale/XMLList.as
@@ -954,6 +954,9 @@ package
{
return _targetProperty;
}
+ /**
+ * @royaleignorecoercion QName
+ */
private function xmlFromProperty(r:XML):XML
{
if (_targetProperty == null || _targetProperty == '*' || (_targetProperty is QName && QName(_targetProperty).localName == '*')) {
@@ -963,7 +966,7 @@ package
var str:String = _targetProperty as String;
ret = new XML();
ret.setParent(r);
- if (str && str.charAt(0)=='@' || (_targetProperty is QName && QName(_targetProperty).isAttribute)) {
+ if (str && str.charAt(0)=='@' || (_targetProperty is QName && (_targetProperty as QName).isAttribute)) {
if (r.child(_targetProperty).length()) return null; //2.c.iv,2
ret.setName(_targetProperty);
// not needed, derived from the QName ret.setNodeKind('attribute');
@@ -1049,9 +1052,10 @@ package
}
/**
+ * [[Put]] from the e4X spec
*
+ * @royaleignorecoercion XML
* @royaleignorecoercion XMLList
- * [[Put]] from the e4X spec
*/
public function setChild(elementName:*, elements:Object):Object
{
[royale-asjs] 02/02: cleaned up coercions
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit df14ef963d476c93383abacccd240b025cecd890
Author: Harbs <ha...@in-tools.com>
AuthorDate: Mon Jul 6 00:39:15 2020 +0300
cleaned up coercions
---
.../Basic/src/main/royale/org/apache/royale/svg/beads/ImageView.as | 4 ++++
.../Basic/src/main/royale/org/apache/royale/utils/UIModuleUtils.as | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/svg/beads/ImageView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/svg/beads/ImageView.as
index cb78b56..36f3098 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/svg/beads/ImageView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/svg/beads/ImageView.as
@@ -48,6 +48,10 @@ package org.apache.royale.svg.beads
{
}
+ /**
+ * @royaleignorecoercion HTMLElement
+ * @royaleignorecoercion org.apache.royale.core.UIBase
+ */
COMPILE::JS
override protected function sizeChangedHandler(event:Object):void
{
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/utils/UIModuleUtils.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/utils/UIModuleUtils.as
index 7b26852..784d87a 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/utils/UIModuleUtils.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/utils/UIModuleUtils.as
@@ -245,7 +245,9 @@ package org.apache.royale.utils
loadHandler();
}
-
+ /**
+ * @royaleignorecoercion org.apache.royale.core.IUIBase
+ */
COMPILE::JS
protected function loadHandler():void
{