[royale-asjs] branch develop updated: get MX FileReference.load() to return a ByteArray. Should fix #708
This is an automated email from the ASF dual-hosted git repository.
aharui 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 24a4254 get MX FileReference.load() to return a ByteArray. Should
fix #708
24a4254 is described below
commit 24a4254948ade714ebc0b9ba8f4e5a211d4c101e
Author: Alex Harui
AuthorDate: Sun May 10 09:38:05 2020 -0700
get MX FileReference.load() to return a ByteArray. Should fix #708
---
.../src/main/royale/mx/net/FileReference.as| 14 +-
.../supportClasses/ByteArrayFileLoader.as} | 56 +++---
.../MXRoyale/src/main/royale/mx/utils/ByteArray.as | 4 +-
.../org/apache/royale/file/beads/FileLoader.as | 6 ++-
4 files changed, 35 insertions(+), 45 deletions(-)
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/net/FileReference.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/net/FileReference.as
index 080d46d..5e07293 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/net/FileReference.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/net/FileReference.as
@@ -30,6 +30,7 @@ package mx.net
import org.apache.royale.net.URLRequest;
import org.apache.royale.file.beads.FileUploader;
import mx.net.beads.FileUploaderUsingFormData;
+ import mx.net.supportClasses.ByteArrayFileLoader;
public class FileReference extends FileProxy
{
@@ -76,10 +77,21 @@ package mx.net
if (!_loader)
{
// FileLoaderAndUploader has injected this
- _loader = getBeadByType(FileLoader) as FileLoader;
+ _loader = getBeadByType(ByteArrayFileLoader) as
FileLoader;
+ if (!_loader)
+ {
+ _loader = new ByteArrayFileLoader();
+ addBead(_loader);
+ }
}
+ _loader.addEventListener(Event.COMPLETE,
loaderCompleteHandler);
_loader.load();
}
+
+ public function loaderCompleteHandler(event:Event):void
+ {
+ dispatchEvent(new Event(Event.COMPLETE));
+ }
public function get data():ByteArray
{
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/utils/ByteArray.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/net/supportClasses/ByteArrayFileLoader.as
similarity index 54%
copy from frameworks/projects/MXRoyale/src/main/royale/mx/utils/ByteArray.as
copy to
frameworks/projects/MXRoyale/src/main/royale/mx/net/supportClasses/ByteArrayFileLoader.as
index 5e7da5f..caf580f 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/utils/ByteArray.as
+++
b/frameworks/projects/MXRoyale/src/main/royale/mx/net/supportClasses/ByteArrayFileLoader.as
@@ -17,50 +17,26 @@
//
-package mx.utils
+package mx.net.supportClasses
{
-COMPILE::SWF{
- import flash.utils.ByteArray;
-}
-COMPILE::JS{
-import org.apache.royale.utils.BinaryData;
-import org.apache.royale.utils.net.IDataInput;
-import org.apache.royale.utils.net.IDataOutput;
-
-}
-COMPILE::SWF{
- public class ByteArray extends flash.utils.ByteArray
- {
- public function ByteArray()
- {
- super();
- }
- }
-}
+ import mx.utils.ByteArray;
+ import org.apache.royale.file.beads.FileLoader;
+ import org.apache.royale.file.beads.FileModel;
+ import org.apache.royale.events.Event;
-COMPILE::JS{
- public class ByteArray extends org.apache.royale.utils.BinaryData
implements IDataInput, IDataOutput
- {
- public function ByteArray()
- {
- super();
- }
- public function readMultiByte(length:uint,
charSet:String):String
+ public class ByteArrayFileLoader extends FileLoader
+ {
+ COMPILE::JS
+ override protected function fileLoadHandler(event:Event):void
{
- return "";
+ fileModel.fileContent = new
ByteArray(event.target.result);
+ dispatchEvent(new Event(Event.COMPLETE));
}
- public function writeMultiByte(value:String,
charSet:String):void
- {
- }
- public function readObject():*
-{
- return null;
-}
-public function writeObject(object:*):void
-{
- }
- }
-}
+
+
+ }
+
+
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/utils/ByteArray.as
[royale-asjs] branch develop updated: tour-de-jewel-pom.xml: avoid explicit versions, replace with ${project.version} (but only in plugin configurations)
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 40b71f0 tour-de-jewel-pom.xml: avoid explicit versions, replace with
${project.version} (but only in plugin configurations)
40b71f0 is described below
commit 40b71f0297ff74d900836cfff146ed96dc7424f4
Author: Carlos Rovira
AuthorDate: Sun May 10 12:46:16 2020 +0200
tour-de-jewel-pom.xml: avoid explicit versions, replace with
${project.version} (but only in plugin configurations)
---
examples/jewel/TourDeJewel/pom.xml | 216 ++---
1 file changed, 108 insertions(+), 108 deletions(-)
diff --git a/examples/jewel/TourDeJewel/pom.xml
b/examples/jewel/TourDeJewel/pom.xml
index a97a09e..d923e43 100644
--- a/examples/jewel/TourDeJewel/pom.xml
+++ b/examples/jewel/TourDeJewel/pom.xml
@@ -50,7 +50,7 @@
org.apache.royale.framework
Jewel-Dark-NoFlat-Emphasized-Amethyst-Theme
- 0.9.8-SNAPSHOT
+ ${project.version}
swc
js
${project.build.directory}/javascript/bin/js-release/assets/themes/Jewel-Dark-NoFlat-Emphasized-Amethyst-Theme
@@ -58,7 +58,7 @@
org.apache.royale.framework
Jewel-Dark-NoFlat-Emphasized-Blue-Theme
- 0.9.8-SNAPSHOT
+ ${project.version}
swc
js
${project.build.directory}/javascript/bin/js-release/assets/themes/Jewel-Dark-NoFlat-Emphasized-Blue-Theme
@@ -66,7 +66,7 @@
org.apache.royale.framework
Jewel-Dark-NoFlat-Emphasized-Emerald-Theme
- 0.9.8-SNAPSHOT
+ ${project.version}
swc
js
${project.build.directory}/javascript/bin/js-release/assets/themes/Jewel-Dark-NoFlat-Emphasized-Emerald-Theme
@@ -74,7 +74,7 @@
org.apache.royale.framework
Jewel-Dark-NoFlat-Emphasized-Green-Theme
- 0.9.8-SNAPSHOT
+ ${project.version}
swc
js
${project.build.directory}/javascript/bin/js-release/assets/themes/Jewel-Dark-NoFlat-Emphasized-Green-Theme
@@ -82,7 +82,7 @@
org.apache.royale.framework
Jewel-Dark-NoFlat-Emphasized-Orange-Theme
- 0.9.8-SNAPSHOT
+ ${project.version}
swc
js
${project.build.directory}/javascript/bin/js-release/assets/themes/Jewel-Dark-NoFlat-Emphasized-Orange-Theme
@@ -90,7 +90,7 @@
org.apache.royale.framework
Jewel-Dark-NoFlat-Emphasized-Red-Theme
- 0.9.8-SNAPSHOT
+ ${project.version}
swc
js
${project.build.directory}/javascript/bin/js-release/assets/themes/Jewel-Dark-NoFlat-Emphasized-Red-Theme
@@ -98,7 +98,7 @@
org.apache.royale.framework
Jewel-Dark-NoFlat-Emphasized-Sapphire-Theme
- 0.9.8-SNAPSHOT
+ ${project.version}
swc
js
${project.build.directory}/javascript/bin/js-release/assets/themes/Jewel-Dark-NoFlat-Emphasized-Sapphire-Theme
@@ -106,7 +106,7 @@
org.apache.royale.framework
Jewel-Dark-NoFlat-Emphasized-Sunflower-Theme
- 0.9.8-SNAPSHOT
+ ${project.version}
swc
js
${project.build.directory}/javascript/bin/js-release/assets/themes/Jewel-Dark-NoFlat-Emphasized-Sunflower-Theme
@@ -114,7 +114,7 @@
org.apache.royale.framework
Jewel-Dark-NoFlat-Emphasized-Topaz-Theme
- 0.9.8-SNAPSHOT
+ ${project.version}
swc
js
${project.build.directory}/javascript/bin/js-release/assets/themes/Jewel-Dark-NoFlat-Emphasized-Topaz-Theme
@@ -122,7 +122,7 @@
org.apache.royale.framework
Jewel-Dark-NoFlat-Emphasized-Turquoise-Theme
- 0.9.8-SNAPSHOT
+ ${project.version}
swc
js
${project.build.directory}/javascript/bin/js-release/assets/themes/Jewel-Dark-NoFlat-Emphasized-Turquoise-Theme
@@ -130,7 +130,7 @@
org.apache.royale.framework
[MAVEN-BUILD] Royale-typedefs - Build # 2531 - Failure
The Apache Jenkins build system has built Royale-typedefs (build #2531) Status: Failure Check console output at https://builds.apache.org/job/Royale-typedefs/2531/ to view the results.
[royale-asjs] branch develop updated: clip dropdowntext
This is an automated email from the ASF dual-hosted git repository.
aharui 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 9cc8965 clip dropdowntext
9cc8965 is described below
commit 9cc8965d1ebfa2dea300521dfb32f78c184257ae
Author: Alex Harui
AuthorDate: Sun May 10 10:44:37 2020 -0700
clip dropdowntext
---
.../main/royale/spark/components/supportClasses/DropDownListButton.as | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/DropDownListButton.as
b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/DropDownListButton.as
index 9b9de07..fd1514b 100644
---
a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/DropDownListButton.as
+++
b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/DropDownListButton.as
@@ -60,7 +60,8 @@ package spark.components.supportClasses
{
if (h < 4) return;
element.innerHTML = 'http://www.w3.org/2000/svg;>' +
+h + 'px" xmlns="http://www.w3.org/2000/svg;>' +
label +
