You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by pi...@apache.org on 2019/09/16 08:07:22 UTC
[royale-asjs] branch release/0.9.6 updated (52dfa71 -> 2642e7f)
This is an automated email from the ASF dual-hosted git repository.
piotrz pushed a change to branch release/0.9.6
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from 52dfa71 Update RELEASE_NOTES
new c41297a Cleanup
new 9eea6fc jewel-slider: Make sliderTrackContainer protected to allow extending
new 2642e7f jewel-slider: Missing COMPILE::JS for sliderTrackContainer field
The 3 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:
.../royale/org/apache/royale/html/BinaryImage.as | 15 ++++---
.../apache/royale/html/beads/BinaryImageLoader.as | 50 ++++++++++++----------
.../apache/royale/jewel/beads/views/SliderView.as | 9 ++--
3 files changed, 43 insertions(+), 31 deletions(-)
[royale-asjs] 03/03: jewel-slider: Missing COMPILE::JS for
sliderTrackContainer field
Posted by pi...@apache.org.
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 2642e7f39a75896dc339ad56bf548a8cf8575267
Author: Piotr Zarzycki <pi...@gmail.com>
AuthorDate: Fri Sep 13 17:45:36 2019 +0200
jewel-slider: Missing COMPILE::JS for sliderTrackContainer field
(cherry picked from commit b62ad74b95220c755fae99d78030626e039f3266)
---
.../src/main/royale/org/apache/royale/jewel/beads/views/SliderView.as | 1 +
1 file changed, 1 insertion(+)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderView.as
index 34d66e8..6970515 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderView.as
@@ -63,6 +63,7 @@ package org.apache.royale.jewel.beads.views
super();
}
+ COMPILE::JS
protected var sliderTrackContainer:HTMLDivElement;
private var rangeModel:IRangeModel;
[royale-asjs] 01/03: Cleanup
Posted by pi...@apache.org.
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 <ha...@in-tools.com>
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);
+ }
+ }
+ }
}
}
[royale-asjs] 02/03: jewel-slider: Make sliderTrackContainer
protected to allow extending
Posted by pi...@apache.org.
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 9eea6fcb42244bc051004d8b4dd92f2301f32246
Author: Piotr Zarzycki <pi...@gmail.com>
AuthorDate: Fri Sep 13 17:00:25 2019 +0200
jewel-slider: Make sliderTrackContainer protected to allow extending
(cherry picked from commit 50ebeba4cc7a4bd1a6e5bb028a2632cb0bc8b6eb)
---
.../main/royale/org/apache/royale/jewel/beads/views/SliderView.as | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderView.as
index 5056404..34d66e8 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SliderView.as
@@ -62,9 +62,11 @@ package org.apache.royale.jewel.beads.views
{
super();
}
-
+
+ protected var sliderTrackContainer:HTMLDivElement;
+
private var rangeModel:IRangeModel;
-
+
private var _track:Button;
private var _thumb:Button;
@@ -129,7 +131,7 @@ package org.apache.royale.jewel.beads.views
var htmlSliderElement:HTMLInputElement = host.element as HTMLInputElement;
htmlSliderElement.value = String(rangeModel.value);
- var sliderTrackContainer:HTMLDivElement = document.createElement('div') as HTMLDivElement;
+ sliderTrackContainer = document.createElement('div') as HTMLDivElement;
sliderTrackContainer.className="slider-track-container";
sliderTrackFill = document.createElement('div') as HTMLDivElement;