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
The following commit(s) were added to refs/heads/develop by this push:
new d362031 Cleaned up ErrorImage bead
d362031 is described below
commit d3620310b4e3946116d288eeb46b73e088105e02
Author: Harbs <[email protected]>
AuthorDate: Sun Jul 12 13:00:22 2020 +0300
Cleaned up ErrorImage bead
---
.../org/apache/royale/html/beads/ErrorImage.as | 44 +++++++++++-----------
.../royale/core/{IImageButton.as => IHasImage.as} | 8 ++--
.../main/royale/org/apache/royale/core/IImage.as | 4 +-
.../royale/org/apache/royale/core/IImageButton.as | 4 +-
4 files changed, 27 insertions(+), 33 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ErrorImage.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ErrorImage.as
index cf4b944..34d39dd 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ErrorImage.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ErrorImage.as
@@ -19,11 +19,11 @@
package org.apache.royale.html.beads {
import org.apache.royale.core.IBead;
- import org.apache.royale.core.IImage;
+ import org.apache.royale.core.IHasImage;
import org.apache.royale.core.IImageModel;
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
- import org.apache.royale.events.EventDispatcher;
+ import org.apache.royale.events.IEventDispatcher;
/**
* The ErrorImage class is a bead that can be used to
@@ -72,13 +72,9 @@ package org.apache.royale.html.beads {
_src = value;
}
- COMPILE::JS{
+ COMPILE::JS
private var _hostElement:HTMLImageElement;
- protected function get hostElement():HTMLImageElement
- {
- return _hostElement;
- }
- }
+
protected function get hostModel():IImageModel
{
return _strand.getBeadByType(IImageModel) as IImageModel;
@@ -91,6 +87,9 @@ package org.apache.royale.html.beads {
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.8
+ * @royaleignorecoercion org.apache.royale.core.IHasImage
+ * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
+ * @royaleignorecoercion HTMLImageElement
*/
public function set strand(value:IStrand):void
{
@@ -98,26 +97,25 @@ package org.apache.royale.html.beads {
COMPILE::JS {
- if(_strand is IImage)
- {
- _hostElement = (_strand as IImage).imageElement as
HTMLImageElement;
- if(_hostElement){
-
- _hostElement.addEventListener('error', errorHandler);
+ _hostElement = (_strand as IHasImage).imageElement as
HTMLImageElement;
+ if(_hostElement){
+
+ _hostElement.addEventListener('error', errorHandler);
- if(_emptyIsError)
- {
- (_strand as
EventDispatcher).addEventListener("beadsAdded", beadsAddedHandler);
- }
- }
+ if(_emptyIsError)
+ {
+ (_strand as
IEventDispatcher).addEventListener("beadsAdded", beadsAddedHandler);
+ }
}
}
}
-
+ /**
+ * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
+ */
COMPILE::JS
private function beadsAddedHandler(event:Event):void
{
- (_strand as EventDispatcher).removeEventListener("beadsAdded",
beadsAddedHandler);
+ (_strand as IEventDispatcher).removeEventListener("beadsAdded",
beadsAddedHandler);
if(hostModel)
hostModel.addEventListener("urlChanged",srcChangedHandler);
@@ -143,9 +141,9 @@ package org.apache.royale.html.beads {
COMPILE::JS
private function errorHandler(event:Event):void {
- if (hostElement.src != _src)
+ if (_hostElement.src != _src)
{
- hostElement.src = _src;
+ _hostElement.src = _src;
}
}
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IImageButton.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IHasImage.as
similarity index 88%
copy from
frameworks/projects/Core/src/main/royale/org/apache/royale/core/IImageButton.as
copy to
frameworks/projects/Core/src/main/royale/org/apache/royale/core/IHasImage.as
index b548562..a4d87d3 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IImageButton.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IHasImage.as
@@ -20,15 +20,15 @@ package org.apache.royale.core
{
/**
- * The IImageButton interface describes the minimum set of properties
- * available to an ImageButton control.
+ * The IHasImage interface describes the minimum set of properties
+ * available to a component with an image.
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.8
- */
- public interface IImageButton
+ */
+ public interface IHasImage
{
COMPILE::JS
function get imageElement():Element;
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IImage.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IImage.as
index 13b0821..8e0803e 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IImage.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IImage.as
@@ -28,11 +28,9 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public interface IImage
+ public interface IImage extends IHasImage
{
COMPILE::JS
- function get imageElement():Element;
- COMPILE::JS
function applyImageData(binaryDataAsString:String):void;
}
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IImageButton.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IImageButton.as
index b548562..e28a609 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IImageButton.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IImageButton.as
@@ -28,10 +28,8 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.9.8
*/
- public interface IImageButton
+ public interface IImageButton extends IHasImage
{
- COMPILE::JS
- function get imageElement():Element;
}
}
