This is an automated email from the ASF dual-hosted git repository. piotrz pushed a commit to branch release/0.9.6 in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit c41297acc1da905ccdc69de434ad65443ddd7e9a Author: Harbs <[email protected]> AuthorDate: Tue Sep 10 10:27:21 2019 +0300 Cleanup (cherry picked from commit e54e086bb09d0cf417898a13687bf19e23516d68) --- .../royale/org/apache/royale/html/BinaryImage.as | 15 ++++--- .../apache/royale/html/beads/BinaryImageLoader.as | 50 ++++++++++++---------- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/BinaryImage.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/BinaryImage.as index e17750f..4c7249e 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/BinaryImage.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/BinaryImage.as @@ -53,16 +53,16 @@ package org.apache.royale.html super(); } + /** + * @royaleemitcoercion org.apache.royale.core.IBinaryImageLoader + */ override public function addedToParent():void { var c:Class = ValuesManager.valuesImpl.getValue(this, "iBinaryImageLoader") as Class; if (c) { - if (c) - { - var loader:IBinaryImageLoader = (new c()) as IBinaryImageLoader; - addBead(loader); - } + var loader:IBinaryImageLoader = (new c()) as IBinaryImageLoader; + addBead(loader); } super.addedToParent(); } @@ -74,12 +74,15 @@ package org.apache.royale.html * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion Royale 0.0 - * @royaleignorecoercion org.apache.royale.core.IImageModel + * @royaleignorecoercion org.apache.royale.core.IBinaryImageModel */ public function get binary():BinaryData { return (model as IBinaryImageModel).binary; } + /** + * @royaleignorecoercion org.apache.royale.core.IBinaryImageModel + */ public function set binary(value:BinaryData):void { (model as IBinaryImageModel).binary = value; diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BinaryImageLoader.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BinaryImageLoader.as index c2d6e85..a93aef2 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BinaryImageLoader.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BinaryImageLoader.as @@ -62,6 +62,10 @@ package org.apache.royale.html.beads private var _strand:IStrand; private var _model:IBinaryImageModel; + /** + * @royaleignorecoercion org.apache.royale.core.IBinaryImageModel + * + */ private function get model():IBinaryImageModel { if(!_model) @@ -86,33 +90,35 @@ package org.apache.royale.html.beads /** * @private - * @royaleignorecoercion Object - * @royaleignorecoercion UIBase + * @royaleignorecoercion org.apache.royale.core.IBinaryImageModel + * @royaleignorecoercion org.apache.royale.core.IImageView */ - private function handleBinaryChange(event:Event):void - { - var m:IBinaryImageModel = model; + private function handleBinaryChange(event:Event):void + { + var m:IBinaryImageModel = model; var imageView:IImageView = _strand.getBeadByType(IImageView) as IImageView; - COMPILE::SWF - { - if (m.binary) { + COMPILE::SWF + { + if (m.binary) + { imageView.setupLoader(); imageView.loader.loadBytes(m.binary.array); - } - } - COMPILE::JS - { - if (m.binary) { + } + } + COMPILE::JS + { + if (m.binary) + { imageView.setupLoader(); - if(_objectURL) - URLUtils.revokeObjectURL(_objectURL); - var blob:Blob = new Blob([m.binary.array]); -// I don't think we need to specify the type. + if(_objectURL) + URLUtils.revokeObjectURL(_objectURL); + var blob:Blob = new Blob([m.binary.array]); + // I don't think we need to specify the type. // var blob = new Blob([response], {type: "image/png"}); - _objectURL = URLUtils.createObjectURL(blob); - (_strand as IBinaryImage).applyImageData(_objectURL); - } - } - } + _objectURL = URLUtils.createObjectURL(blob); + (_strand as IBinaryImage).applyImageData(_objectURL); + } + } + } } }
