You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2019/12/12 23:47:14 UTC
[royale-asjs] 13/42: jewel: various import organizations and use
toggleClass method in SimpleButton
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
commit 4a3e9f90d7cc5133ee2c86268d0ee547be8c396f
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Thu Nov 28 20:02:24 2019 +0100
jewel: various import organizations and use toggleClass method in SimpleButton
---
.../org/apache/royale/jewel/beads/views/ListView.as | 5 ++++-
.../org/apache/royale/jewel/supportClasses/Viewport.as | 5 ++++-
.../royale/jewel/supportClasses/button/SimpleButton.as | 4 ++--
.../apache/royale/jewel/supportClasses/list/DataGroup.as | 15 +++++++--------
4 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
index e64912d..c5a0b6d 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
@@ -18,6 +18,10 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel.beads.views
{
+ COMPILE::JS
+ {
+ import org.apache.royale.events.IEventDispatcher;
+ }
import org.apache.royale.core.IItemRendererParent;
import org.apache.royale.core.ILayoutView;
import org.apache.royale.core.IRollOverModel;
@@ -25,7 +29,6 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.core.ISelectionModel;
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
- import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.html.beads.DataContainerView;
/**
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/Viewport.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/Viewport.as
index 21ab897..d0ee025 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/Viewport.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/Viewport.as
@@ -18,11 +18,14 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel.supportClasses
{
+ COMPILE::JS
+ {
import org.apache.royale.core.IContentView;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.UIBase;
- import org.apache.royale.html.supportClasses.Viewport;
import org.apache.royale.utils.loadBeadFromValuesManager;
+ }
+ import org.apache.royale.html.supportClasses.Viewport;
/**
* A Viewport is the area of a Container set aside for displaying
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/button/SimpleButton.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/button/SimpleButton.as
index f3da34e..a9c8999 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/button/SimpleButton.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/button/SimpleButton.as
@@ -205,11 +205,11 @@ package org.apache.royale.jewel.supportClasses.button
{
if(_emphasis)
{
- classSelectorList.toggle(_emphasis, false);
+ toggleClass(_emphasis, false);
}
_emphasis = value;
- classSelectorList.toggle(_emphasis, value);
+ toggleClass(_emphasis, value);
}
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/list/DataGroup.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/list/DataGroup.as
index 72f2a87..2e37891 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/list/DataGroup.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/list/DataGroup.as
@@ -18,17 +18,16 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel.supportClasses.list
{
- import org.apache.royale.html.DataContainer;
- import org.apache.royale.core.IBead;
- import org.apache.royale.core.IStrand;
-
COMPILE::JS
{
- import org.apache.royale.core.WrappedHTMLElement;
- import org.apache.royale.html.util.addElementToWrapper;
- import org.apache.royale.html.beads.DataContainerView;
+ import org.apache.royale.core.WrappedHTMLElement;
+ import org.apache.royale.html.util.addElementToWrapper;
+ import org.apache.royale.html.beads.DataContainerView;
}
-
+ import org.apache.royale.html.DataContainer;
+ import org.apache.royale.core.IBead;
+ import org.apache.royale.core.IStrand;
+
/**
* The DataGroup class is the IItemRendererParent used internally
* by org.apache.royale.jewel.List class.