You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by gr...@apache.org on 2020/03/23 09:03:12 UTC
[royale-asjs] branch develop updated: Adding some small changes to
support porting. MX Fade is a placeholder. Will be tested/matched for api.
This is an automated email from the ASF dual-hosted git repository.
gregdove 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 8f641f7 Adding some small changes to support porting. MX Fade is a placeholder. Will be tested/matched for api.
8f641f7 is described below
commit 8f641f79c57552b859f7057064c7593624233265
Author: greg-dove <gr...@gmail.com>
AuthorDate: Mon Mar 23 22:02:45 2020 +1300
Adding some small changes to support porting.
MX Fade is a placeholder. Will be tested/matched for api.
---
.../Jewel/src/main/sass/components/_button.sass | 3 +
.../src/main/resources/mx-royale-manifest.xml | 1 +
.../MXRoyale/src/main/royale/MXRoyaleClasses.as | 3 +
.../src/main/royale/mx/effects/Fade.as} | 83 +++++++++++-----------
.../MXRoyale/src/main/royale/mx/net/URLLoader.as | 5 +-
.../main/royale/org/apache/royale/net/URLLoader.as | 13 ++++
6 files changed, 63 insertions(+), 45 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_button.sass b/frameworks/projects/Jewel/src/main/sass/components/_button.sass
index 90f4b0e..3ccaba9 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_button.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_button.sass
@@ -53,6 +53,9 @@
.fonticon
cursor: inherit
+ // temporal for badges (we need to refactor it)
+ &.viewport
+ overflow: visible
@media -royale-swf
j|Button
diff --git a/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml b/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
index d2932af..04b0943 100644
--- a/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
+++ b/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
@@ -130,6 +130,7 @@
<component id="GridItem" class="mx.containers.GridItem"/>
<component id="GridRow" class="mx.containers.GridRow"/>
<component id="Parallel" class="mx.effects.Parallel"/>
+ <component id="Fade" class="mx.effects.Fade"/>
<component id="AdvancedDataGridItemRenderer" class="mx.controls.advancedDataGridClasses.AdvancedDataGridItemRenderer" />
<component id="Tree" class="mx.controls.Tree"/>
<component id="LinkBar" class="mx.controls.LinkBar"/>
diff --git a/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as b/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
index 3213775..50e7b37 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
@@ -76,6 +76,9 @@ internal class MXRoyaleClasses
import mx.charts.ChartItem; ChartItem;
import mx.core.ClassFactory; ClassFactory;
import mx.effects.Tween; Tween;
+ import mx.effects.Fade; Fade;
+ import mx.core.Container;Container;
+
import mx.system.ApplicationDomain; ApplicationDomain;
import mx.rpc.http.HTTPService; mx.rpc.http.HTTPService;
import mx.rpc.remoting.RemoteObject; mx.rpc.remoting.RemoteObject;
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_button.sass b/frameworks/projects/MXRoyale/src/main/royale/mx/effects/Fade.as
similarity index 51%
copy from frameworks/projects/Jewel/src/main/sass/components/_button.sass
copy to frameworks/projects/MXRoyale/src/main/royale/mx/effects/Fade.as
index 90f4b0e..8bfc781 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_button.sass
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/effects/Fade.as
@@ -17,44 +17,45 @@
//
////////////////////////////////////////////////////////////////////////////////
-// Jewel Button
-
-// Button variables
-
-.jewel.button
- cursor: pointer
- user-select: none
-
- display: inline-flex
- position: relative
- align-items: center
- justify-content: center
- zoom: 1
- vertical-align: middle
- overflow: hidden
- outline: none
-
- // -- BUTTON LABEL
- white-space: nowrap
- line-height: normal !important
-
- text:
- align: center
- decoration: none
-
- // &:focus
-
- &[disabled]
- cursor: default
-
- &.multiline
- white-space: pre-wrap
-
- .fonticon
- cursor: inherit
-
-
-@media -royale-swf
- j|Button
- IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.TextModel")
- IBeadView: ClassReference("org.apache.royale.jewel.beads.views.ButtonView")
\ No newline at end of file
+package mx.effects
+{
+import org.apache.royale.effects.Fade;
+import org.apache.royale.core.IUIBase;
+
+/**
+ * The Resize effect animates a UI component's width or height.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+public class Fade extends org.apache.royale.effects.Fade
+{
+
+ //--------------------------------------------------------------------------
+ //
+ // Constructor
+ //
+ //--------------------------------------------------------------------------
+
+ /**
+ * Constructor.
+ *
+ * @param target Object ID or reference to an object that will
+ * have its x and/or y property animated.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 9
+ * @playerversion AIR 1.1
+ * @productversion Royale 1.0.0
+ */
+ public function Fade(target:IUIBase = null)
+ {
+ super(IUIBase);
+
+ }
+
+}
+
+}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/net/URLLoader.as b/frameworks/projects/MXRoyale/src/main/royale/mx/net/URLLoader.as
index 08b85a5..e2a943d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/net/URLLoader.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/net/URLLoader.as
@@ -75,10 +75,7 @@ package mx.net
return false;
}
- public function close():void
- {
-
- }
+
}
}
\ No newline at end of file
diff --git a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/URLLoader.as b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/URLLoader.as
index d8f5c9f..381e8a5 100644
--- a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/URLLoader.as
+++ b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/URLLoader.as
@@ -331,6 +331,19 @@ package org.apache.royale.net
return element.responseText;
}
}
+
+
+ public function close():void{
+ COMPILE::SWF{
+ urlLoader.close();
+ }
+ COMPILE::JS{
+ if (element.readyState ==0 || element.readyState ==4) {
+ throw new Error('Error #2029: This URLStream object does not have a stream opened.');
+ }
+ element.abort();
+ }
+ }
}
}