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/27 16:54:41 UTC
[royale-asjs] branch develop updated: iemphasis: refactor to affect
StyledUIBase
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 b21098e iemphasis: refactor to affect StyledUIBase
b21098e is described below
commit b21098e3e1a5f961656223284deb93d18de2a623
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Dec 27 17:54:02 2019 +0100
iemphasis: refactor to affect StyledUIBase
---
.../royale/org/apache/royale/core}/IEmphasis.as | 3 +-
.../apache/royale/core/StyledMXMLItemRenderer.as | 33 ++++++++++++++++++-
.../royale/org/apache/royale/core/StyledUIBase.as | 37 +++++++++++++++++++--
.../royale/org/apache/royale/jewel/ButtonBar.as | 36 ++------------------
.../royale/org/apache/royale/jewel/DataGrid.as | 2 +-
.../main/royale/org/apache/royale/jewel/List.as | 36 +++++++++++++++++---
.../royale/org/apache/royale/jewel/Snackbar.as | 31 ++----------------
.../apache/royale/jewel/beads/controls/Badge.as | 2 +-
.../royale/jewel/beads/views/DataGridView.as | 3 +-
.../itemRenderers/IconButtonBarItemRenderer.as | 6 ++--
.../jewel/supportClasses/button/SimpleButton.as | 38 +++-------------------
11 files changed, 113 insertions(+), 114 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/IEmphasis.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IEmphasis.as
similarity index 97%
rename from frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/IEmphasis.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IEmphasis.as
index b369c69..cb46c1e 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/IEmphasis.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IEmphasis.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.supportClasses
+package org.apache.royale.core
{
/**
* The IEmphasis is the interface a jewel control implements to get diferent jewel
@@ -44,3 +44,4 @@ package org.apache.royale.jewel.supportClasses
function set emphasis(value:String):void;
}
}
+
\ No newline at end of file
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
index fa86c50..3a954b1 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
@@ -31,7 +31,7 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public class StyledMXMLItemRenderer extends MXMLItemRenderer implements IClassSelectorListSupport, IRuntimeSelectableItemRenderer
+ public class StyledMXMLItemRenderer extends MXMLItemRenderer implements IClassSelectorListSupport, IRuntimeSelectableItemRenderer, IEmphasis
{
/**
* constructor.
@@ -186,5 +186,36 @@ package org.apache.royale.core
{
_hoverable = value;
}
+
+ private var _emphasis:String;
+ /**
+ * Applies emphasis color display. Possible constant values are: PRIMARY, SECONDARY, EMPHASIZED.
+ * Colors are defined in royale jewel theme CSS.
+ *
+ * Left without value to get the default look (light or dark).
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.7
+ */
+ public function get emphasis():String
+ {
+ return _emphasis;
+ }
+ [Inspectable(category="General", enumeration="primary,secondary,emphasized")]
+ public function set emphasis(value:String):void
+ {
+ if (_emphasis != value)
+ {
+ if(_emphasis)
+ {
+ toggleClass(_emphasis, false);
+ }
+ _emphasis = value;
+
+ toggleClass(_emphasis, value);
+ }
+ }
}
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as
index e644da7..e9d98cc 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as
@@ -20,9 +20,10 @@ package org.apache.royale.core
{
COMPILE::JS
{
- import org.apache.royale.core.WrappedHTMLElement;
- import org.apache.royale.html.util.addElementToWrapper;
+ import org.apache.royale.core.WrappedHTMLElement;
+ import org.apache.royale.html.util.addElementToWrapper;
}
+ import org.apache.royale.events.Event;
import org.apache.royale.utils.ClassSelectorList;
import org.apache.royale.utils.IClassSelectorListSupport;
@@ -35,7 +36,7 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class StyledUIBase extends UIBase implements IClassSelectorListSupport
+ public class StyledUIBase extends UIBase implements IClassSelectorListSupport, IEmphasis
{
/**
* Constructor.
@@ -141,6 +142,36 @@ package org.apache.royale.core
}
}
+ private var _emphasis:String;
+ /**
+ * Applies emphasis color display. Possible constant values are: PRIMARY, SECONDARY, EMPHASIZED.
+ * Colors are defined in royale jewel theme CSS.
+ *
+ * Left without value to get the default look (light or dark).
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.6
+ */
+ public function get emphasis():String
+ {
+ return _emphasis;
+ }
+ public function set emphasis(value:String):void
+ {
+ if (_emphasis != value)
+ {
+ if(_emphasis)
+ {
+ removeClass(_emphasis);
+ }
+ _emphasis = value;
+
+ addClass(_emphasis);
+ }
+ }
+
/**
* @return The actual element to be parented.
* @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ButtonBar.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ButtonBar.as
index cf5b984..7d15c30 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ButtonBar.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ButtonBar.as
@@ -24,8 +24,7 @@ package org.apache.royale.jewel
import org.apache.royale.html.util.addElementToWrapper;
}
import org.apache.royale.html.beads.models.ButtonBarModel;
- import org.apache.royale.jewel.supportClasses.IEmphasis;
-
+
/**
* The Jewel ButtonBar class is a component that displays a set of Buttons. The ButtonBar
* is actually a List with a default horizontal layout and an itemRenderer that
@@ -48,7 +47,7 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- public class ButtonBar extends List implements IEmphasis
+ public class ButtonBar extends List
{
public static const PRIMARY:String = "primary";
public static const SECONDARY:String = "secondary";
@@ -111,37 +110,6 @@ package org.apache.royale.jewel
// ButtonBarModel(model).widthType = value;
// }
- private var _emphasis:String;
- /**
- * Applies emphasis color display. Possible constant values are: PRIMARY, SECONDARY, EMPHASIZED.
- * Colors are defined in royale jewel theme CSS.
- *
- * Left without value to get the default look (light or dark).
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.7
- */
- public function get emphasis():String
- {
- return _emphasis;
- }
- [Inspectable(category="General", enumeration="primary,secondary,emphasized")]
- public function set emphasis(value:String):void
- {
- if (_emphasis != value)
- {
- if(_emphasis)
- {
- toggleClass(_emphasis, false);
- }
- _emphasis = value;
-
- toggleClass(_emphasis, value);
- }
- }
-
/**
* @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement
*/
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataGrid.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataGrid.as
index 85136f5..a8e3225 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataGrid.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataGrid.as
@@ -22,8 +22,8 @@ package org.apache.royale.jewel
import org.apache.royale.core.IDataGrid;
import org.apache.royale.core.IDataGridModel;
import org.apache.royale.core.IDataGridPresentationModel;
+ import org.apache.royale.core.IEmphasis;
import org.apache.royale.core.ValuesManager;
- import org.apache.royale.jewel.supportClasses.IEmphasis;
[Event(name="change", type="org.apache.royale.events.Event")]
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as
index c46b3c2..3b769ee 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as
@@ -18,11 +18,8 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel
{
- COMPILE::JS
- {
- import org.apache.royale.core.WrappedHTMLElement;
- }
import org.apache.royale.core.IDataProviderModel;
+ import org.apache.royale.core.IEmphasis;
import org.apache.royale.core.IListPresentationModel;
import org.apache.royale.core.IRollOverModel;
import org.apache.royale.core.ISelectionModel;
@@ -67,7 +64,7 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public class List extends DataContainerBase
+ public class List extends DataContainerBase implements IEmphasis
{
/**
* constructor.
@@ -232,6 +229,35 @@ package org.apache.royale.jewel
return presModel;
}
+ private var _emphasis:String;
+ /**
+ * Applies emphasis color display. Possible constant values are: PRIMARY, SECONDARY, EMPHASIZED.
+ * Colors are defined in royale jewel theme CSS.
+ *
+ * Left without value to get the default look (light or dark).
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.7
+ */
+ public function get emphasis():String
+ {
+ return _emphasis;
+ }
+ [Inspectable(category="General", enumeration="primary,secondary,emphasized")]
+ public function set emphasis(value:String):void
+ {
+ if (_emphasis != value)
+ {
+ if(_emphasis)
+ {
+ toggleClass(_emphasis, false);
+ }
+ _emphasis = value;
+ toggleClass(_emphasis, value);
+ }
+ }
}
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Snackbar.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Snackbar.as
index 1685c31..d9cdebc 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Snackbar.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Snackbar.as
@@ -18,16 +18,10 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel
{
- COMPILE::JS
- {
- import org.apache.royale.core.WrappedHTMLElement;
- import org.apache.royale.html.util.addElementToWrapper;
- }
import org.apache.royale.core.IPopUp;
import org.apache.royale.core.StyledUIBase;
import org.apache.royale.events.Event;
import org.apache.royale.jewel.beads.models.SnackbarModel;
- import org.apache.royale.jewel.supportClasses.IEmphasis;
[Event(name="action", type="org.apache.royale.events.Event")]
/**
@@ -48,7 +42,7 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public class Snackbar extends StyledUIBase implements IPopUp, IEmphasis
+ public class Snackbar extends StyledUIBase implements IPopUp
{
/**
* constructor.
@@ -76,28 +70,7 @@ package org.apache.royale.jewel
* @productversion Royale 0.9.4
*/
public static const ACTION:String = "action";
-
- private var _emphasis:String;
-
- public function get emphasis():String
- {
- return _emphasis;
- }
-
- public function set emphasis(value:String):void
- {
- if (_emphasis != value)
- {
- if(_emphasis)
- {
- removeClass(_emphasis);
- }
- _emphasis = value;
-
- addClass(_emphasis);
- }
- }
-
+
/**
* The number of milliseconds to show the Snackbar.
*
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
index 6c0f8a0..c27283f 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
@@ -19,10 +19,10 @@
package org.apache.royale.jewel.beads.controls
{
import org.apache.royale.core.IBead;
+ import org.apache.royale.core.IEmphasis;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.UIBase;
import org.apache.royale.jewel.Label;
- import org.apache.royale.jewel.supportClasses.IEmphasis;
/**
* The Badge class provides a small status descriptors for UI elements.
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as
index d006b26..0e8e0d7 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as
@@ -26,6 +26,7 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.core.IDataGrid;
import org.apache.royale.core.IDataGridModel;
import org.apache.royale.core.IDataGridPresentationModel;
+ import org.apache.royale.core.IEmphasis;
import org.apache.royale.core.IParent;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.IUIBase;
@@ -36,12 +37,10 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.html.beads.GroupView;
import org.apache.royale.html.beads.IDataGridView;
import org.apache.royale.jewel.beads.layouts.ButtonBarLayout;
- import org.apache.royale.jewel.supportClasses.IEmphasis;
import org.apache.royale.jewel.supportClasses.Viewport;
import org.apache.royale.jewel.supportClasses.datagrid.DataGridButtonBar;
import org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumn;
import org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumnList;
- import org.apache.royale.html.beads.models.ButtonBarModel;
/**
* The DataGridView class is the visual bead for the org.apache.royale.jewel.DataGrid.
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as
index 637e471..a03e35a 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as
@@ -20,8 +20,9 @@ package org.apache.royale.jewel.itemRenderers
{
COMPILE::JS
{
- import org.apache.royale.core.WrappedHTMLElement;
+
}
+ import org.apache.royale.core.IEmphasis;
import org.apache.royale.core.IIcon;
import org.apache.royale.core.SimpleCSSStylesWithFlex;
import org.apache.royale.core.ValuesManager;
@@ -30,9 +31,8 @@ package org.apache.royale.jewel.itemRenderers
import org.apache.royale.html.beads.ITextItemRenderer;
import org.apache.royale.html.util.getLabelFromData;
import org.apache.royale.jewel.IconButton;
- import org.apache.royale.jewel.beads.views.ButtonBarView;
- import org.apache.royale.jewel.supportClasses.IEmphasis;
import org.apache.royale.jewel.IconButtonBar;
+ import org.apache.royale.jewel.beads.views.ButtonBarView;
/**
* The IconButtonBarItemRenderer class extends IconButton and turns it into an itemRenderer
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 b4c70db..f68a980 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
@@ -20,7 +20,10 @@ package org.apache.royale.jewel.supportClasses.button
{
COMPILE::SWF
{
+ import org.apache.royale.core.IEmphasis;
import org.apache.royale.core.UIButtonBase;
+ import org.apache.royale.utils.ClassSelectorList;
+ import org.apache.royale.utils.IClassSelectorListSupport;
}
COMPILE::JS
@@ -33,9 +36,6 @@ package org.apache.royale.jewel.supportClasses.button
import org.apache.royale.core.IStrand;
import org.apache.royale.core.IUIBase;
import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.utils.ClassSelectorList;
- import org.apache.royale.utils.IClassSelectorListSupport;
- import org.apache.royale.jewel.supportClasses.IEmphasis;
//--------------------------------------
// Events
@@ -298,7 +298,7 @@ package org.apache.royale.jewel.supportClasses.button
* @productversion Royale 0.9.6
*/
COMPILE::JS
- public class SimpleButton extends StyledUIBase implements IStrand, IUIBase, IEventDispatcher, IEmphasis
+ public class SimpleButton extends StyledUIBase implements IStrand, IUIBase, IEventDispatcher
{
public static const PRIMARY:String = "primary";
public static const SECONDARY:String = "secondary";
@@ -318,36 +318,6 @@ package org.apache.royale.jewel.supportClasses.button
typeNames = "jewel button";
}
- private var _emphasis:String;
- /**
- * Applies emphasis color display. Possible constant values are: PRIMARY, SECONDARY, EMPHASIZED.
- * Colors are defined in royale jewel theme CSS.
- *
- * Left without value to get the default look (light or dark).
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.6
- */
- public function get emphasis():String
- {
- return _emphasis;
- }
- public function set emphasis(value:String):void
- {
- if (_emphasis != value)
- {
- if(_emphasis)
- {
- removeClass(_emphasis);
- }
- _emphasis = value;
-
- addClass(_emphasis);
- }
- }
-
/**
* @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement
* @royaleignorecoercion org.apache.royale.html.util.addElementToWrapper