royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlosrov...@apache.org
Subject [royale-asjs] branch develop updated: little fixes
Date Mon, 10 Sep 2018 10:32:57 GMT
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 8eb1d64  little fixes
8eb1d64 is described below

commit 8eb1d6498acb58fed3829c26010f22e5d14ebc54
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Mon Sep 10 12:32:53 2018 +0200

    little fixes
---
 .../projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as  | 4 ++--
 .../src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as  | 4 ++--
 .../org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as
index 640b396..edd9415 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as
@@ -439,11 +439,11 @@ package org.apache.royale.jewel
             {
                 if(_emphasis)
                 {
-                    toggleClass(_emphasis, false);
+                    removeClass(_emphasis);
                 }
                 _emphasis = value;
 
-                toggleClass(_emphasis, value);
+                addClass(_emphasis);
             }
         }
 
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
index e58f6f5..e4de92e 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
@@ -206,7 +206,7 @@ package org.apache.royale.jewel.beads.views
             {
                 okButton = new Button();
 				okButton.width = 100;
-				okButton.emphasis = "primary";
+				okButton.emphasis = Button.PRIMARY;
                 okButton.text = alertModel.okLabel;
                 okButton.addEventListener(MouseEvent.CLICK, handleOK);
 
@@ -227,7 +227,7 @@ package org.apache.royale.jewel.beads.views
             {
                 yesButton = new Button();
 				yesButton.width = 100;
-				yesButton.emphasis = "primary";
+				yesButton.emphasis = Button.PRIMARY;
                 yesButton.text = alertModel.yesLabel;
                 yesButton.addEventListener(MouseEvent.CLICK, handleYes);
 
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
index 35e6f17..64b98f7 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
@@ -38,7 +38,7 @@ limitations under the License.
         <js:MXMLBeadViewDataBinding />
     </js:beads>
 
-    <j:Button id="textButton" text="JewelLabelViewBead" emphasis="primary"/>
+    <j:Button id="textButton" text="JewelLabelViewBead" emphasis="{Button.PRIMARY}"/>
     
 <!--
     


Mime
View raw message