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 7a23ba5 jewel-layouts: use new replaceClass method to save several
lines of code
7a23ba5 is described below
commit 7a23ba5d732b411339b8fdb313914f53b2f3aacd
Author: Carlos Rovira <[email protected]>
AuthorDate: Sun Jun 14 22:58:55 2020 +0200
jewel-layouts: use new replaceClass method to save several lines of code
---
.../royale/jewel/beads/layouts/BasicLayout.as | 12 +----
.../royale/jewel/beads/layouts/FormItemLayout.as | 7 +--
.../royale/jewel/beads/layouts/FormLayout.as | 7 +--
.../royale/jewel/beads/layouts/GridCellLayout.as | 56 +++++-----------------
.../royale/jewel/beads/layouts/GridLayout.as | 12 ++---
.../beads/layouts/HorizontalCenteredLayout.as | 11 ++---
.../jewel/beads/layouts/HorizontalFlowLayout.as | 11 ++---
.../jewel/beads/layouts/SimpleHorizontalLayout.as | 13 ++---
.../jewel/beads/layouts/SimpleVerticalLayout.as | 11 +----
.../royale/jewel/beads/layouts/TableLayout.as | 11 +----
.../jewel/beads/layouts/TileHorizontalLayout.as | 7 +--
.../jewel/beads/layouts/TileVerticalLayout.as | 7 +--
.../jewel/beads/layouts/VerticalCenteredLayout.as | 11 ++---
.../jewel/beads/layouts/VerticalFlowLayout.as | 11 ++---
.../jewel/supportClasses/button/SimpleButton.as | 16 +++++++
15 files changed, 66 insertions(+), 137 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/BasicLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/BasicLayout.as
index 53bdfda..6e4844f 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/BasicLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/BasicLayout.as
@@ -69,16 +69,8 @@ package org.apache.royale.jewel.beads.layouts
override public function beadsAddedHandler(event:Event =
null):void
{
super.beadsAddedHandler();
-
- COMPILE::JS
- {
- if (hostComponent.containsClass("layout"))
- hostComponent.removeClass("layout");
- hostComponent.addClass("layout");
- if(hostComponent.containsClass("basic"))
- hostComponent.removeClass("basic");
- hostComponent.addClass("basic");
- }
+ hostComponent.replaceClass("layout");
+ hostComponent.replaceClass("basic");
}
/**
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/FormItemLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/FormItemLayout.as
index 0a12c8c..4fdeb44 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/FormItemLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/FormItemLayout.as
@@ -65,12 +65,7 @@ package org.apache.royale.jewel.beads.layouts
{
super.beadsAddedHandler();
- COMPILE::JS
- {
- if(hostComponent.containsClass("formitem"))
- hostComponent.removeClass("formitem");
- hostComponent.addClass("formitem");
- }
+ hostComponent.replaceClass("formitem");
}
/**
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/FormLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/FormLayout.as
index 9784f21..76e6638 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/FormLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/FormLayout.as
@@ -65,12 +65,7 @@ package org.apache.royale.jewel.beads.layouts
{
super.beadsAddedHandler();
- COMPILE::JS
- {
- if(hostComponent.containsClass("form"))
- hostComponent.removeClass("form");
- hostComponent.addClass("form");
- }
+ hostComponent.replaceClass("form");
}
/**
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridCellLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridCellLayout.as
index 6a3b147..96bd835 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridCellLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridCellLayout.as
@@ -325,9 +325,7 @@ package org.apache.royale.jewel.beads.layouts
if (den <= 0 || den > MAX_COLUMNS)
throw new Error(screen + " denominator
must be between 1 and " + MAX_COLUMNS);
- if (hostComponent.containsClass(screen +
"-col-" + _desktopNumerator + "-" + _desktopDenominator))
- hostComponent.removeClass(screen +
"-col-" + _desktopNumerator + "-" + _desktopDenominator);
- hostComponent.addClass(screen + "-col-" + num +
"-" + den);
+ hostComponent.replaceClass(screen + "-col-" +
_desktopNumerator + "-" + _desktopDenominator, screen + "-col-" + num + "-" +
den);
}
}
@@ -357,16 +355,9 @@ package org.apache.royale.jewel.beads.layouts
if(hostComponent)
{
if(_phoneVisible)
- {
- if
(hostComponent.containsClass("hidden-phone"))
-
hostComponent.removeClass("hidden-phone");
-
hostComponent.addClass("visible-phone");
- } else
- {
- if
(hostComponent.containsClass("visible-phone"))
-
hostComponent.removeClass("visible-phone");
-
hostComponent.addClass("hidden-phone");
- }
+
hostComponent.replaceClass("hidden-phone", "visible-phone");
+ else
+
hostComponent.replaceClass("visible-phone", "hidden-phone");
}
}
}
@@ -398,16 +389,9 @@ package org.apache.royale.jewel.beads.layouts
if(hostComponent)
{
if(_tabletVisible)
- {
- if
(hostComponent.containsClass("hidden-tablet"))
-
hostComponent.removeClass("hidden-tablet");
-
hostComponent.addClass("visible-tablet");
- } else
- {
- if
(hostComponent.containsClass("visible-tablet"))
-
hostComponent.removeClass("visible-tablet");
-
hostComponent.addClass("hidden-tablet");
- }
+
hostComponent.replaceClass("hidden-tablet", "visible-tablet");
+ else
+
hostComponent.replaceClass("visible-tablet", "hidden-tablet");
}
}
}
@@ -439,16 +423,9 @@ package org.apache.royale.jewel.beads.layouts
if(hostComponent)
{
if(_desktopVisible)
- {
- if
(hostComponent.containsClass("hidden-desktop"))
-
hostComponent.removeClass("hidden-desktop");
-
hostComponent.addClass("visible-desktop");
- } else
- {
- if
(hostComponent.containsClass("visible-desktop"))
-
hostComponent.removeClass("visible-desktop");
-
hostComponent.addClass("hidden-desktop");
- }
+
hostComponent.replaceClass("hidden-desktop", "visible-desktop");
+ else
+
hostComponent.replaceClass("visible-desktop", "hidden-desktop");
}
}
}
@@ -480,16 +457,9 @@ package org.apache.royale.jewel.beads.layouts
if(hostComponent)
{
if(_wideScreenVisible)
- {
- if
(hostComponent.containsClass("hidden-widescreen"))
-
hostComponent.removeClass("hidden-widescreen");
-
hostComponent.addClass("visible-widescreen");
- } else
- {
- if
(hostComponent.containsClass("visible-widescreen"))
-
hostComponent.removeClass("visible-widescreen");
-
hostComponent.addClass("hidden-widescreen");
- }
+
hostComponent.replaceClass("hidden-widescreen", "visible-widescreen");
+ else
+
hostComponent.replaceClass("visible-widescreen", "hidden-widescreen");
}
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridLayout.as
index 2c1c20e..1be0a57 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridLayout.as
@@ -64,16 +64,12 @@ package org.apache.royale.jewel.beads.layouts
{
super.beadsAddedHandler();
+ hostComponent.replaceClass("layout");
+ hostComponent.replaceClass("grid");
+
COMPILE::JS
{
- if (hostComponent.containsClass("layout"))
- hostComponent.removeClass("layout");
- hostComponent.addClass("layout");
- if(hostComponent.containsClass("grid"))
- hostComponent.removeClass("grid");
- hostComponent.addClass("grid");
-
- setGap(_gap);
+ setGap(_gap);
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalCenteredLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalCenteredLayout.as
index c2169c7..ffb44d1 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalCenteredLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalCenteredLayout.as
@@ -73,14 +73,13 @@ package org.apache.royale.jewel.beads.layouts
{
super.beadsAddedHandler();
+ hostComponent.replaceClass("centered");
+
+ applyStyleToLayout(hostComponent, "gap");
+
COMPILE::JS
{
- if(hostComponent.containsClass("centered"))
- hostComponent.removeClass("centered");
- hostComponent.addClass("centered");
-
- applyStyleToLayout(hostComponent, "gap");
- setGap(_gap);
+ setGap(_gap);
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalFlowLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalFlowLayout.as
index 812d58f..4328aa7 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalFlowLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalFlowLayout.as
@@ -73,14 +73,13 @@ package org.apache.royale.jewel.beads.layouts
{
super.beadsAddedHandler();
+ hostComponent.replaceClass("flow");
+
+ applyStyleToLayout(hostComponent, "gap");
+
COMPILE::JS
{
- if(hostComponent.containsClass("flow"))
- hostComponent.removeClass("flow");
- hostComponent.addClass("flow");
-
- applyStyleToLayout(hostComponent, "gap");
- setGap(_gap);
+ setGap(_gap);
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/SimpleHorizontalLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/SimpleHorizontalLayout.as
index 529302a..d5b7d05 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/SimpleHorizontalLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/SimpleHorizontalLayout.as
@@ -75,16 +75,9 @@ package org.apache.royale.jewel.beads.layouts
override public function beadsAddedHandler(event:Event =
null):void
{
super.beadsAddedHandler();
-
- COMPILE::JS
- {
- if (hostComponent.containsClass("layout"))
- hostComponent.removeClass("layout");
- hostComponent.addClass("layout");
- if(hostComponent.containsClass("horizontal"))
- hostComponent.removeClass("horizontal");
- hostComponent.addClass("horizontal");
- }
+
+ hostComponent.replaceClass("layout");
+ hostComponent.replaceClass("horizontal");
}
/**
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/SimpleVerticalLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/SimpleVerticalLayout.as
index ee7a292..d4beba2 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/SimpleVerticalLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/SimpleVerticalLayout.as
@@ -77,15 +77,8 @@ package org.apache.royale.jewel.beads.layouts
{
super.beadsAddedHandler();
- COMPILE::JS
- {
- if (hostComponent.containsClass("layout"))
- hostComponent.removeClass("layout");
- hostComponent.addClass("layout");
- if(hostComponent.containsClass("vertical"))
- hostComponent.removeClass("vertical");
- hostComponent.addClass("vertical");
- }
+ hostComponent.replaceClass("layout");
+ hostComponent.replaceClass("vertical");
}
/**
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TableLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TableLayout.as
index d7b5fc1..557768a 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TableLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TableLayout.as
@@ -70,15 +70,8 @@ package org.apache.royale.jewel.beads.layouts
{
super.beadsAddedHandler();
- COMPILE::JS
- {
- if (hostComponent.containsClass("layout"))
- hostComponent.removeClass("layout");
- hostComponent.addClass("layout");
- if(hostComponent.containsClass("table"))
- hostComponent.removeClass("table");
- hostComponent.addClass("table");
- }
+ hostComponent.replaceClass("layout");
+ hostComponent.replaceClass("table");
}
/**
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileHorizontalLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileHorizontalLayout.as
index 0ac0b35..24ff5dc 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileHorizontalLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileHorizontalLayout.as
@@ -72,12 +72,7 @@ package org.apache.royale.jewel.beads.layouts
{
super.beadsAddedHandler();
- COMPILE::JS
- {
- if(hostComponent.containsClass("tile"))
- hostComponent.removeClass("tile");
- hostComponent.addClass("tile");
- }
+ hostComponent.replaceClass("tile");
}
private var _columnCount:int = -1;
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as
index 8caabd6..b342e1c 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as
@@ -77,12 +77,7 @@ package org.apache.royale.jewel.beads.layouts
{
super.beadsAddedHandler();
- COMPILE::JS
- {
- if(hostComponent.containsClass("tile"))
- hostComponent.removeClass("tile");
- hostComponent.addClass("tile");
- }
+ hostComponent.replaceClass("tile");
}
private var _columnCount:int = -1;
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalCenteredLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalCenteredLayout.as
index 1abcdaa..45c5941 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalCenteredLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalCenteredLayout.as
@@ -73,14 +73,13 @@ package org.apache.royale.jewel.beads.layouts
{
super.beadsAddedHandler();
+ hostComponent.replaceClass("centered");
+
+ applyStyleToLayout(hostComponent, "gap");
+
COMPILE::JS
{
- if(hostComponent.containsClass("centered"))
- hostComponent.removeClass("centered");
- hostComponent.addClass("centered");
-
- applyStyleToLayout(hostComponent, "gap");
- setGap(_gap);
+ setGap(_gap);
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalFlowLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalFlowLayout.as
index af1e8aa..f8a336b 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalFlowLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalFlowLayout.as
@@ -74,14 +74,13 @@ package org.apache.royale.jewel.beads.layouts
{
super.beadsAddedHandler();
+ hostComponent.replaceClass("flow");
+
+ applyStyleToLayout(hostComponent, "gap");
+
COMPILE::JS
{
- if(hostComponent.containsClass("flow"))
- hostComponent.removeClass("flow");
- hostComponent.addClass("flow");
-
- applyStyleToLayout(hostComponent, "gap");
- setGap(_gap);
+ setGap(_gap);
}
}
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 d4b21ac..7f8289c 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
@@ -318,6 +318,22 @@ package org.apache.royale.jewel.supportClasses.button
{
return false;
}
+
+ /**
+ * Replace a class for a new one
+ *
+ * @param oldClass Name of selector to remove.
+ * @param newClass Name of selector to set.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.10.0
+ */
+ public function replaceClass(oldClass:String, newClass:String =
null):void
+ {
+ // To implement. Need to implement this interface or extensions
will not compile
+ }
}
/**
