You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/02/23 06:35:10 UTC
[royale-asjs] branch develop updated (5db1e78 -> 5db5c2c)
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from 5db1e78 no commas in classname list
new dfc85d6 watch out for private property collisions in JS
new 53db8b9 default Group to 1 pixel border width
new bc71108 fix up typenames for labels
new e41c70d use global selector properly
new 5db5c2c clean up warnings
The 5 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:
examples/royale/RoyaleStore/src/main/royale/beige.css | 16 +---------------
examples/royale/RoyaleStore/src/main/royale/main.css | 10 ++++------
.../src/main/royale/productsView/ProductList.mxml | 15 +++++++++++++++
.../src/main/royale/productsView/ProductListItem.mxml | 4 ++++
.../royale/samples/royalestore/ProductFilterEvent.as | 7 +++++++
.../main/royale/samples/royalestore/ProductListEvent.as | 3 +++
.../main/royale/samples/royalestore/ProductThumbEvent.as | 3 +++
.../src/main/royale/org/apache/royale/html/Group.as | 1 +
.../src/main/royale/org/apache/royale/html/Label.as | 2 +-
.../main/royale/org/apache/royale/html/MultilineLabel.as | 1 +
.../src/main/royale/org/apache/royale/effects/Fade.as | 8 +++++---
.../src/main/royale/org/apache/royale/effects/Move.as | 8 +++++---
.../src/main/royale/org/apache/royale/effects/Resize.as | 8 +++++---
.../src/main/royale/org/apache/royale/effects/Wipe.as | 8 +++++---
frameworks/themes/Basic/basic.css | 5 +++++
15 files changed, 65 insertions(+), 34 deletions(-)
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 05/05: clean up warnings
Posted by ah...@apache.org.
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
commit 5db5c2ca2b95d83fac5463d1c85030df06e55bf8
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Feb 22 22:34:50 2018 -0800
clean up warnings
---
.../src/main/royale/productsView/ProductList.mxml | 15 +++++++++++++++
.../src/main/royale/productsView/ProductListItem.mxml | 4 ++++
.../main/royale/samples/royalestore/ProductFilterEvent.as | 7 +++++++
.../main/royale/samples/royalestore/ProductListEvent.as | 3 +++
.../main/royale/samples/royalestore/ProductThumbEvent.as | 3 +++
5 files changed, 32 insertions(+)
diff --git a/examples/royale/RoyaleStore/src/main/royale/productsView/ProductList.mxml b/examples/royale/RoyaleStore/src/main/royale/productsView/ProductList.mxml
index 018b905..4c31b61 100755
--- a/examples/royale/RoyaleStore/src/main/royale/productsView/ProductList.mxml
+++ b/examples/royale/RoyaleStore/src/main/royale/productsView/ProductList.mxml
@@ -44,12 +44,27 @@ limitations under the License.
import samples.royalestore.Product;
import samples.royalestore.ProductListEvent;
+ /**
+ * @royalesuppresspublicvarwarning
+ */
public var items:Array;
+ /**
+ * @royalesuppresspublicvarwarning
+ */
public var newItemStartX:int;
+
+ /**
+ * @royalesuppresspublicvarwarning
+ */
public var newItemStartY:int;
+
[Bindable]
public var maxItems:int = 0;
+
+ /**
+ * @royalesuppresspublicvarwarning
+ */
public var showQuantity:Boolean;
private var playingEffects:Object = new Object();
diff --git a/examples/royale/RoyaleStore/src/main/royale/productsView/ProductListItem.mxml b/examples/royale/RoyaleStore/src/main/royale/productsView/ProductListItem.mxml
index 23e7fd0..4b8e4c9 100755
--- a/examples/royale/RoyaleStore/src/main/royale/productsView/ProductListItem.mxml
+++ b/examples/royale/RoyaleStore/src/main/royale/productsView/ProductListItem.mxml
@@ -35,6 +35,10 @@ limitations under the License.
import samples.royalestore.ProductListEvent;
private static var idCounter:int = 0;
+
+ /**
+ * @royalesuppresspublicvarwarning
+ */
public var uid:String = (idCounter++).toString();
public static const HEIGHT:int = 30;
diff --git a/examples/royale/RoyaleStore/src/main/royale/samples/royalestore/ProductFilterEvent.as b/examples/royale/RoyaleStore/src/main/royale/samples/royalestore/ProductFilterEvent.as
index 002b33b..be6f267 100755
--- a/examples/royale/RoyaleStore/src/main/royale/samples/royalestore/ProductFilterEvent.as
+++ b/examples/royale/RoyaleStore/src/main/royale/samples/royalestore/ProductFilterEvent.as
@@ -25,7 +25,14 @@ public class ProductFilterEvent extends Event
{
public static const FILTER:String = "filter";
+ /**
+ * @royalesuppresspublicvarwarning
+ */
public var live:Boolean;
+
+ /**
+ * @royalesuppresspublicvarwarning
+ */
public var filter:ProductFilter;
public function ProductFilterEvent(filter:ProductFilter, live:Boolean)
diff --git a/examples/royale/RoyaleStore/src/main/royale/samples/royalestore/ProductListEvent.as b/examples/royale/RoyaleStore/src/main/royale/samples/royalestore/ProductListEvent.as
index 3022855..64a8ef9 100755
--- a/examples/royale/RoyaleStore/src/main/royale/samples/royalestore/ProductListEvent.as
+++ b/examples/royale/RoyaleStore/src/main/royale/samples/royalestore/ProductListEvent.as
@@ -28,6 +28,9 @@ public class ProductListEvent extends Event
public static const REMOVE_PRODUCT:String = "removeProduct";
public static const PRODUCT_QTY_CHANGE:String = "productQtyChange";
+ /**
+ * @royalesuppresspublicvarwarning
+ */
public var product:Product;
//making the default bubbles behavior of the event to true since we want
diff --git a/examples/royale/RoyaleStore/src/main/royale/samples/royalestore/ProductThumbEvent.as b/examples/royale/RoyaleStore/src/main/royale/samples/royalestore/ProductThumbEvent.as
index 8a0eeff..7b66768 100755
--- a/examples/royale/RoyaleStore/src/main/royale/samples/royalestore/ProductThumbEvent.as
+++ b/examples/royale/RoyaleStore/src/main/royale/samples/royalestore/ProductThumbEvent.as
@@ -29,6 +29,9 @@ public class ProductThumbEvent extends Event
public static const DETAILS:String = "details";
public static const BROWSE:String = "browse";
+ /**
+ * @royalesuppresspublicvarwarning
+ */
public var product:Product;
public function ProductThumbEvent(type:String, product:Product)
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 03/05: fix up typenames for labels
Posted by ah...@apache.org.
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
commit bc711083170328b2b06dbaedd00cbdea0b6c1e4b
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Feb 22 22:31:43 2018 -0800
fix up typenames for labels
---
.../projects/Basic/src/main/royale/org/apache/royale/html/Label.as | 2 +-
.../Basic/src/main/royale/org/apache/royale/html/MultilineLabel.as | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Label.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Label.as
index bb36430..39ab2f3 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Label.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Label.as
@@ -70,6 +70,7 @@ package org.apache.royale.html
public function Label()
{
super();
+ typeNames = "Label";
}
COMPILE::JS
@@ -181,7 +182,6 @@ package org.apache.royale.html
element.style.whiteSpace = "nowrap";
- typeNames = "Label";
return element;
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MultilineLabel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MultilineLabel.as
index 4e76394..f3d7419 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MultilineLabel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MultilineLabel.as
@@ -51,6 +51,7 @@ package org.apache.royale.html
public function MultilineLabel()
{
super();
+ typeNames += " MultilineLabel";
}
/**
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 04/05: use global selector properly
Posted by ah...@apache.org.
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
commit e41c70dc2103699a596a2885c648d1d4c00efb64
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Feb 22 22:34:25 2018 -0800
use global selector properly
---
examples/royale/RoyaleStore/src/main/royale/beige.css | 16 +---------------
examples/royale/RoyaleStore/src/main/royale/main.css | 10 ++++------
2 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/examples/royale/RoyaleStore/src/main/royale/beige.css b/examples/royale/RoyaleStore/src/main/royale/beige.css
index fd71f53..92746fd 100755
--- a/examples/royale/RoyaleStore/src/main/royale/beige.css
+++ b/examples/royale/RoyaleStore/src/main/royale/beige.css
@@ -25,26 +25,12 @@
/*
//----------------------------
-// Global styles
-//----------------------------
-*/
-.global
-{
- highlightAlphas: .5, .25;
- borderColor: #939A9D;
- headerColors: #A65904, #E68701;
- themeColor: #75B1CE;
- rollOverColor: #D6E6EE;
- selectionColor: #B8D5E4;
-}
-
-/*
-//----------------------------
// Type selectors
//----------------------------
*/
Application
{
+ borderColor: #939A9D;
backgroundColor: #EAE6DD;
backgroundImage: "assets/beige_background.jpg";
}
diff --git a/examples/royale/RoyaleStore/src/main/royale/main.css b/examples/royale/RoyaleStore/src/main/royale/main.css
index 2117039..ddb5a30 100755
--- a/examples/royale/RoyaleStore/src/main/royale/main.css
+++ b/examples/royale/RoyaleStore/src/main/royale/main.css
@@ -26,18 +26,16 @@
// Global styles
//----------------------------
*/
-.global {
- IStatesImpl: ClassReference("org.apache.royale.core.StatesWithTransitionsImpl");
- color: #170505;
- fillAlphas: 1.00, 1.00; /* last pair are for OVER state */
- fillColors: #FFFFFF, #DDDDDD, #FFFFFF, #EEEEEE;
-}
global {
IStatesImpl: ClassReference("org.apache.royale.core.StatesWithTransitionsImpl");
IEffectTimer: ClassReference("org.apache.royale.utils.EffectTimer");
}
+basic|Application {
+ color: #170505;
+}
+
/*
//----------------------------
// Type selectors
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 02/05: default Group to 1 pixel border width
Posted by ah...@apache.org.
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
commit 53db8b99af7cb92e00c607379d1157aeeb788666
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Feb 22 22:31:02 2018 -0800
default Group to 1 pixel border width
---
.../projects/Basic/src/main/royale/org/apache/royale/html/Group.as | 1 +
frameworks/themes/Basic/basic.css | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Group.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Group.as
index c0a79ab..524eeef 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Group.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Group.as
@@ -66,6 +66,7 @@ package org.apache.royale.html
public function Group()
{
super();
+ typeNames = "Group";
}
private var _mxmlDescriptor:Array;
diff --git a/frameworks/themes/Basic/basic.css b/frameworks/themes/Basic/basic.css
index b292b26..b54edfa 100644
--- a/frameworks/themes/Basic/basic.css
+++ b/frameworks/themes/Basic/basic.css
@@ -43,6 +43,11 @@ List
border: 1px solid #222222;
}
+Group
+{
+ border-width: 1px;
+}
+
RadioButton
{
font-size: 12px;
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 01/05: watch out for private property collisions in JS
Posted by ah...@apache.org.
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
commit dfc85d6497e48dec75f7cc97fb5392c3cd2edbcf
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Feb 22 22:29:52 2018 -0800
watch out for private property collisions in JS
---
.../Effects/src/main/royale/org/apache/royale/effects/Fade.as | 8 +++++---
.../Effects/src/main/royale/org/apache/royale/effects/Move.as | 8 +++++---
.../Effects/src/main/royale/org/apache/royale/effects/Resize.as | 8 +++++---
.../Effects/src/main/royale/org/apache/royale/effects/Wipe.as | 8 +++++---
4 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/Fade.as b/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/Fade.as
index dae391c..94eafed 100644
--- a/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/Fade.as
+++ b/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/Fade.as
@@ -80,7 +80,9 @@ public class Fade extends Tween implements IDocument
*/
private var actualTarget:IUIBase;
- private var _target:String;
+ // there is already a _target in the base class
+ // and JS can't hide it
+ private var target_:String;
/**
* The target as the String id
@@ -88,12 +90,12 @@ public class Fade extends Tween implements IDocument
*/
public function get target():String
{
- return _target;
+ return target_;
}
public function set target(value:String):void
{
- _target = value;
+ target_ = value;
}
/**
diff --git a/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/Move.as b/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/Move.as
index 6081e87..b64be13 100644
--- a/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/Move.as
+++ b/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/Move.as
@@ -80,7 +80,9 @@ public class Move extends Tween implements IDocument
*/
private var actualTarget:IUIBase;
- private var _target:String;
+ // there is already a _target in the base class
+ // and JS can't hide it
+ private var target_:String;
/**
* The target as the String id
@@ -88,12 +90,12 @@ public class Move extends Tween implements IDocument
*/
public function get target():String
{
- return _target;
+ return target_;
}
public function set target(value:String):void
{
- _target = value;
+ target_ = value;
}
private var _xBy:Number;
diff --git a/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/Resize.as b/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/Resize.as
index cffca8f..b4d824d 100644
--- a/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/Resize.as
+++ b/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/Resize.as
@@ -80,7 +80,9 @@ public class Resize extends Tween implements IDocument
*/
private var actualTarget:IUIBase;
- private var _target:String;
+ // there is already a _target in the base class
+ // and JS can't hide it
+ private var target_:String;
/**
* The target as the String id
@@ -88,12 +90,12 @@ public class Resize extends Tween implements IDocument
*/
public function get target():String
{
- return _target;
+ return target_;
}
public function set target(value:String):void
{
- _target = value;
+ target_ = value;
}
private var _widthBy:Number;
diff --git a/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/Wipe.as b/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/Wipe.as
index 15060a0..4289231 100644
--- a/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/Wipe.as
+++ b/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/Wipe.as
@@ -79,7 +79,9 @@ public class Wipe extends Tween implements IDocument
*/
private var actualTarget:IUIBase;
- private var _target:String;
+ // there is already a _target in the base class
+ // and JS can't hide it
+ private var target_:String;
/**
* The target as the String id
@@ -87,12 +89,12 @@ public class Wipe extends Tween implements IDocument
*/
public function get target():String
{
- return _target;
+ return target_;
}
public function set target(value:String):void
{
- _target = value;
+ target_ = value;
}
private var _direction:String;
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.