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 17f9ad0 jewel: remove overriding functions that are not needed anymore
17f9ad0 is described below
commit 17f9ad0dad4f8f356d2757196ca57cc856cadd2b
Author: Carlos Rovira <[email protected]>
AuthorDate: Tue Apr 23 12:21:22 2019 +0200
jewel: remove overriding functions that are not needed anymore
---
.../royale/org/apache/royale/jewel/Application.as | 2 +-
.../src/main/royale/org/apache/royale/jewel/Bar.as | 31 ----------------------
.../jewel/supportClasses/drawer/DrawerBase.as | 31 ----------------------
3 files changed, 1 insertion(+), 63 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
index c878138..70ef0ad 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
@@ -516,7 +516,7 @@ package org.apache.royale.jewel
addChild(c as DisplayObject);
}
COMPILE::JS {
- this.element.appendChild(c.element as HTMLElement);
+ element.appendChild(c.positioner);
(c as IUIBase).addedToParent();
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Bar.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Bar.as
index b7e3ec2..99c7118 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Bar.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Bar.as
@@ -93,36 +93,5 @@ package org.apache.royale.jewel
_positioner.royale_wrapper = this;
_positioner.appendChild(element);
}
-
- /**
- * @copy org.apache.royale.core.IParent#addElement()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- * @royaleignorecoercion org.apache.royale.core.IUIBase
- */
- override public function addElement(c:IChild,
dispatchEvent:Boolean = true):void
- {
- COMPILE::SWF
- {
- if (c is IUIBase)
- {
- if (c is IRenderedObject)
- $sprite_addChild(IRenderedObject(c).$displayObject);
- else
- $sprite_addChild(c as DisplayObject);
- IUIBase(c).addedToParent();
- }
- else
- $sprite_addChild(c as DisplayObject);
- }
- COMPILE::JS
- {
- element.appendChild(c.positioner);
- (c as IUIBase).addedToParent();
- }
- }
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/drawer/DrawerBase.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/drawer/DrawerBase.as
index 7c1e107..e64292b 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/drawer/DrawerBase.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/drawer/DrawerBase.as
@@ -107,36 +107,5 @@ package org.apache.royale.jewel.supportClasses.drawer
_positioner.royale_wrapper = this;
_positioner.appendChild(element);
}
-
- /**
- * @copy org.apache.royale.core.IParent#addElement()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- * @royaleignorecoercion org.apache.royale.core.IUIBase
- */
- override public function addElement(c:IChild,
dispatchEvent:Boolean = true):void
- {
- COMPILE::SWF
- {
- if (c is IUIBase)
- {
- if (c is IRenderedObject)
- $sprite_addChild(IRenderedObject(c).$displayObject);
- else
- $sprite_addChild(c as DisplayObject);
- IUIBase(c).addedToParent();
- }
- else
- $sprite_addChild(c as DisplayObject);
- }
- COMPILE::JS
- {
- element.appendChild(c.positioner);
- (c as IUIBase).addedToParent();
- }
- }
}
}
