This is an automated email from the ASF dual-hosted git repository.
piotrz 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 1cce4873cc Jewel: Add missing method implementation on SWF side
1cce4873cc is described below
commit 1cce4873cc70b3c847d3362c6a3e47d5a4e9d021
Author: Piotr Zarzycki <piotrzarzyck...@gmail.com>
AuthorDate: Fri May 19 13:36:57 2023 +0200
Jewel: Add missing method implementation on SWF side
- Resolve issue ambiguous reference to Event
---
.../royale/jewel/beads/layouts/TileHorizontalLayout.as | 15 +++++++++++----
.../royale/jewel/beads/layouts/TileVerticalLayout.as | 12 +++++++++---
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileHorizontalLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileHorizontalLayout.as
index 13455eb670..fc419d2e20 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileHorizontalLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileHorizontalLayout.as
@@ -122,7 +122,14 @@ package org.apache.royale.jewel.beads.layouts
return dispatcher.dispatchEvent(event);
}
+ COMPILE::SWF
+ public function willTrigger(type:String):Boolean
+ {
+ return false;
+ }
+
//IEventDispatcher (shared)
+
public function hasEventListener(type:String):Boolean
{
return dispatcher.hasEventListener(type);
@@ -138,12 +145,12 @@ package org.apache.royale.jewel.beads.layouts
* @playerversion AIR 2.6
* @productversion Royale 0.9.8
*/
- override public function beadsAddedHandler(event:Event =
null):void
+ override public function
beadsAddedHandler(event:org.apache.royale.events.Event = null):void
{
super.beadsAddedHandler();
hostComponent.replaceClass("tile");
- hostComponent.dispatchEvent(new Event("layoutNeeded"));
+ hostComponent.dispatchEvent(new
org.apache.royale.events.Event("layoutNeeded"));
COMPILE::JS{
//OSUtils.getOS() == OSUtils.MAC_OS ||
OSUtils.getOS() == OSUtils.IOS_OS ??
@@ -348,7 +355,7 @@ package org.apache.royale.jewel.beads.layouts
}
private var _oldScrollWidth:Number;
- private function observedChangeSize(event:Event):void
+ private function
observedChangeSize(event:org.apache.royale.events.Event):void
{
COMPILE::JS{
if(_oldScrollWidth !=
hostComponent.element.scrollWidth)
@@ -591,7 +598,7 @@ package org.apache.royale.jewel.beads.layouts
else
child.positioner.style.marginRight = null;
- child.dispatchEvent(new
Event('sizeChanged'));
+ child.dispatchEvent(new
org.apache.royale.events.Event('sizeChanged'));
}
return true;
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as
index 37f7f33909..09a1eb11ec 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as
@@ -126,6 +126,12 @@ package org.apache.royale.jewel.beads.layouts
return dispatcher.dispatchEvent(event);
}
+ COMPILE::SWF
+ public function willTrigger(type:String):Boolean
+ {
+ return false;
+ }
+
//IEventDispatcher (shared)
public function hasEventListener(type:String):Boolean
{
@@ -142,12 +148,12 @@ package org.apache.royale.jewel.beads.layouts
* @playerversion AIR 2.6
* @productversion Royale 0.9.8
*/
- override public function beadsAddedHandler(event:Event =
null):void
+ override public function
beadsAddedHandler(event:org.apache.royale.events.Event = null):void
{
super.beadsAddedHandler();
hostComponent.replaceClass("tile");
- hostComponent.dispatchEvent(new Event("layoutNeeded"));
+ hostComponent.dispatchEvent(new
org.apache.royale.events.Event("layoutNeeded"));
}
private var _columnCount:int = -1;
@@ -543,7 +549,7 @@ package org.apache.royale.jewel.beads.layouts
// else
//
child.positioner.style.marginRight = null;
- child.dispatchEvent(new
Event('sizeChanged'));
+ child.dispatchEvent(new
org.apache.royale.events.Event('sizeChanged'));
}
return true;
}
