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 d88dd70b3923390a2396c3de123518eb1fc7855f Author: Carlos Rovira <[email protected]> AuthorDate: Tue Jun 2 12:56:09 2020 +0200 jewel-layouts: remove hostClassList and use StyledUIBase as base class, since is ui base class in Jewel --- .../src/main/royale/LayoutsPlayGround.mxml | 55 ++++++++++++++++++++++ .../royale/jewel/beads/layouts/BasicLayout.as | 12 ++--- .../royale/jewel/beads/layouts/ButtonBarLayout.as | 30 ++++++------ .../royale/jewel/beads/layouts/FormItemLayout.as | 12 ++--- .../royale/jewel/beads/layouts/FormLayout.as | 12 ++--- .../royale/jewel/beads/layouts/GridCellLayout.as | 54 ++++++++++----------- .../royale/jewel/beads/layouts/GridLayout.as | 24 ++++------ .../beads/layouts/HorizontalCenteredLayout.as | 20 ++++---- .../jewel/beads/layouts/HorizontalFlowLayout.as | 20 ++++---- .../royale/jewel/beads/layouts/HorizontalLayout.as | 12 ++--- .../jewel/beads/layouts/SimpleHorizontalLayout.as | 12 ++--- .../jewel/beads/layouts/SimpleVerticalLayout.as | 12 ++--- .../royale/jewel/beads/layouts/StyledLayoutBase.as | 37 ++++++--------- .../royale/jewel/beads/layouts/TableLayout.as | 20 ++++---- .../jewel/beads/layouts/VerticalCenteredLayout.as | 20 ++++---- .../jewel/beads/layouts/VerticalFlowLayout.as | 20 ++++---- .../royale/jewel/beads/layouts/VerticalLayout.as | 12 ++--- 17 files changed, 199 insertions(+), 185 deletions(-) diff --git a/examples/jewel/TourDeJewel/src/main/royale/LayoutsPlayGround.mxml b/examples/jewel/TourDeJewel/src/main/royale/LayoutsPlayGround.mxml index e83fb01..d082ec4 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/LayoutsPlayGround.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/LayoutsPlayGround.mxml @@ -188,6 +188,61 @@ limitations under the License. </j:CardActions> </j:Card> </j:GridCell> + + <j:GridCell desktopNumerator="1" desktopDenominator="2" tabletNumerator="1" tabletDenominator="2" phoneNumerator="1" phoneDenominator="1"> + <j:Card> + <j:CardHeader> + <j:CardTitle text="TileLayout" className="primary-normal"/> + </j:CardHeader> + <j:CardPrimaryContent> + + <j:Group className="wrapper" width="100%" height="200"> + <j:beads> + <j:TileLayout localId="tl" horizontalGap="6" /> + </j:beads> + <j:Button text="1" emphasis="primary" width="60" height="60"/> + <j:Button text="2" emphasis="secondary" width="60" height="60"/> + <j:Button text="3" emphasis="emphasized" width="60" height="60"/> + <j:Button text="4" width="60" height="60"/> + <j:Button text="5" emphasis="primary" width="60" height="60"/> + <j:Button text="6" emphasis="secondary" width="60" height="60"/> + <j:Button text="7" emphasis="emphasized" width="60" height="60"/> + <j:Button text="8" width="60" height="60"/> + <j:Button text="9" emphasis="primary" width="60" height="60"/> + <j:Button text="10" emphasis="secondary" width="60" height="60"/> + <j:Button text="11" emphasis="emphasized" width="60" height="60"/> + <j:Button text="12" width="60" height="60"/> + </j:Group> + + </j:CardPrimaryContent> + <j:CardActions itemsHorizontalAlign = "itemsCenter"> + <j:VGroup> + <j:VGroup> + <j:Label text="columnCount"/> + <j:HSlider width="200" value="3" minimum="1" maximum="6" valueChange="tl.columnCount = event.target.value"/> + </j:VGroup> + <j:VGroup> + <j:Label text="columnWidth"/> + <j:HSlider width="200" value="100" minimum="50" maximum="150" valueChange="tl.columnWidth = event.target.value"/> + </j:VGroup> + <j:VGroup> + <j:Label text="rowHeight"/> + <j:HSlider width="200" value="0" minimum="0" maximum="10" valueChange="tl.rowHeight = event.target.value"/> + </j:VGroup> + </j:VGroup> + <j:VGroup> + <j:VGroup> + <j:Label text="verticalGap"/> + <j:HSlider width="200" value="0" minimum="0" maximum="10" valueChange="tl.verticalGap = event.target.value"/> + </j:VGroup> + <j:VGroup> + <j:Label text="horizontalGap"/> + <j:HSlider width="200" value="0" minimum="0" maximum="10" valueChange="tl.horizontalGap = event.target.value"/> + </j:VGroup> + </j:VGroup> + </j:CardActions> + </j:Card> + </j:GridCell> <j:GridCell desktopNumerator="1" desktopDenominator="3" tabletNumerator="1" tabletDenominator="3" phoneNumerator="1" phoneDenominator="1"> <j:Card> 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 3f4bb6b..223fb5e 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 @@ -75,12 +75,12 @@ package org.apache.royale.jewel.beads.layouts COMPILE::JS { - if (hostClassList.contains("layout")) - hostClassList.remove("layout"); - hostClassList.add("layout"); - if(hostClassList.contains("basic")) - hostClassList.remove("basic"); - hostClassList.add("basic"); + if (hostComponent.containsClass("layout")) + hostComponent.removeClass("layout"); + hostComponent.addClass("layout"); + if(hostComponent.containsClass("basic")) + hostComponent.removeClass("basic"); + hostComponent.addClass("basic"); } } diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/ButtonBarLayout.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/ButtonBarLayout.as index b1aadc8..637e4aa 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/ButtonBarLayout.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/ButtonBarLayout.as @@ -100,35 +100,35 @@ package org.apache.royale.jewel.beads.layouts { if(hostComponent) { - if (hostClassList.contains("pixelWidths")) - hostClassList.remove("pixelWidths"); - if (hostClassList.contains("proportinalWidths")) - hostClassList.remove("proportinalWidths"); - if (hostClassList.contains("percentWidths")) - hostClassList.remove("percentWidths"); - if (hostClassList.contains("naturalWidths")) - hostClassList.remove("naturalWidths"); - if (hostClassList.contains("sameWidths")) - hostClassList.remove("sameWidths"); + if (hostComponent.containsClass("pixelWidths")) + hostComponent.removeClass("pixelWidths"); + if (hostComponent.containsClass("proportinalWidths")) + hostComponent.removeClass("proportinalWidths"); + if (hostComponent.containsClass("percentWidths")) + hostComponent.removeClass("percentWidths"); + if (hostComponent.containsClass("naturalWidths")) + hostComponent.removeClass("naturalWidths"); + if (hostComponent.containsClass("sameWidths")) + hostComponent.removeClass("sameWidths"); if(isNaN(model.widthType)) { - hostClassList.add("sameWidths"); + hostComponent.addClass("sameWidths"); } else { switch(model.widthType) { case ButtonBarModel.PIXEL_WIDTHS: - hostClassList.add("pixelWidths"); + hostComponent.addClass("pixelWidths"); break; case ButtonBarModel.PROPORTIONAL_WIDTHS: - hostClassList.add("proportinalWidths"); + hostComponent.addClass("proportinalWidths"); break; case ButtonBarModel.PERCENT_WIDTHS: - hostClassList.add("percentWidths"); + hostComponent.addClass("percentWidths"); break; case ButtonBarModel.NATURAL_WIDTHS: - hostClassList.add("naturalWidths"); + hostComponent.addClass("naturalWidths"); break; } } 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 8f58321..0a12c8c 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 @@ -18,12 +18,6 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.royale.jewel.beads.layouts { - COMPILE::JS { - import org.apache.royale.core.UIBase; - } - import org.apache.royale.core.ILayoutChild; - import org.apache.royale.core.ILayoutView; - import org.apache.royale.core.IUIBase; import org.apache.royale.events.Event; /** @@ -73,9 +67,9 @@ package org.apache.royale.jewel.beads.layouts COMPILE::JS { - if(hostClassList.contains("formitem")) - hostClassList.remove("formitem"); - hostClassList.add("formitem"); + if(hostComponent.containsClass("formitem")) + hostComponent.removeClass("formitem"); + hostComponent.addClass("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 00ae316..9784f21 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 @@ -18,12 +18,6 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.royale.jewel.beads.layouts { - COMPILE::JS { - import org.apache.royale.core.UIBase; - } - import org.apache.royale.core.ILayoutChild; - import org.apache.royale.core.ILayoutView; - import org.apache.royale.core.IUIBase; import org.apache.royale.events.Event; /** @@ -73,9 +67,9 @@ package org.apache.royale.jewel.beads.layouts COMPILE::JS { - if(hostClassList.contains("form")) - hostClassList.remove("form"); - hostClassList.add("form"); + if(hostComponent.containsClass("form")) + hostComponent.removeClass("form"); + hostComponent.addClass("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 8dc7bfd..6a3b147 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,9 @@ 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 (hostClassList.contains(screen + "-col-" + _desktopNumerator + "-" + _desktopDenominator)) - hostClassList.remove(screen + "-col-" + _desktopNumerator + "-" + _desktopDenominator); - hostClassList.add(screen + "-col-" + num + "-" + den); + if (hostComponent.containsClass(screen + "-col-" + _desktopNumerator + "-" + _desktopDenominator)) + hostComponent.removeClass(screen + "-col-" + _desktopNumerator + "-" + _desktopDenominator); + hostComponent.addClass(screen + "-col-" + num + "-" + den); } } @@ -358,14 +358,14 @@ package org.apache.royale.jewel.beads.layouts { if(_phoneVisible) { - if (hostClassList.contains("hidden-phone")) - hostClassList.remove("hidden-phone"); - hostClassList.add("visible-phone"); + if (hostComponent.containsClass("hidden-phone")) + hostComponent.removeClass("hidden-phone"); + hostComponent.addClass("visible-phone"); } else { - if (hostClassList.contains("visible-phone")) - hostClassList.remove("visible-phone"); - hostClassList.add("hidden-phone"); + if (hostComponent.containsClass("visible-phone")) + hostComponent.removeClass("visible-phone"); + hostComponent.addClass("hidden-phone"); } } } @@ -399,14 +399,14 @@ package org.apache.royale.jewel.beads.layouts { if(_tabletVisible) { - if (hostClassList.contains("hidden-tablet")) - hostClassList.remove("hidden-tablet"); - hostClassList.add("visible-tablet"); + if (hostComponent.containsClass("hidden-tablet")) + hostComponent.removeClass("hidden-tablet"); + hostComponent.addClass("visible-tablet"); } else { - if (hostClassList.contains("visible-tablet")) - hostClassList.remove("visible-tablet"); - hostClassList.add("hidden-tablet"); + if (hostComponent.containsClass("visible-tablet")) + hostComponent.removeClass("visible-tablet"); + hostComponent.addClass("hidden-tablet"); } } } @@ -440,14 +440,14 @@ package org.apache.royale.jewel.beads.layouts { if(_desktopVisible) { - if (hostClassList.contains("hidden-desktop")) - hostClassList.remove("hidden-desktop"); - hostClassList.add("visible-desktop"); + if (hostComponent.containsClass("hidden-desktop")) + hostComponent.removeClass("hidden-desktop"); + hostComponent.addClass("visible-desktop"); } else { - if (hostClassList.contains("visible-desktop")) - hostClassList.remove("visible-desktop"); - hostClassList.add("hidden-desktop"); + if (hostComponent.containsClass("visible-desktop")) + hostComponent.removeClass("visible-desktop"); + hostComponent.addClass("hidden-desktop"); } } } @@ -481,14 +481,14 @@ package org.apache.royale.jewel.beads.layouts { if(_wideScreenVisible) { - if (hostClassList.contains("hidden-widescreen")) - hostClassList.remove("hidden-widescreen"); - hostClassList.add("visible-widescreen"); + if (hostComponent.containsClass("hidden-widescreen")) + hostComponent.removeClass("hidden-widescreen"); + hostComponent.addClass("visible-widescreen"); } else { - if (hostClassList.contains("visible-widescreen")) - hostClassList.remove("visible-widescreen"); - hostClassList.add("hidden-widescreen"); + if (hostComponent.containsClass("visible-widescreen")) + hostComponent.removeClass("visible-widescreen"); + hostComponent.addClass("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 4b46483..f32d177 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 @@ -18,10 +18,6 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.royale.jewel.beads.layouts { - COMPILE::JS { - import org.apache.royale.core.UIBase; - import org.apache.royale.core.WrappedHTMLElement; - } import org.apache.royale.events.Event; import org.apache.royale.jewel.beads.layouts.StyledLayoutBase; @@ -70,12 +66,12 @@ package org.apache.royale.jewel.beads.layouts COMPILE::JS { - if (hostClassList.contains("layout")) - hostClassList.remove("layout"); - hostClassList.add("layout"); - if(hostClassList.contains("grid")) - hostClassList.remove("grid"); - hostClassList.add("grid"); + if (hostComponent.containsClass("layout")) + hostComponent.removeClass("layout"); + hostComponent.addClass("layout"); + if(hostComponent.containsClass("grid")) + hostComponent.removeClass("grid"); + hostComponent.addClass("grid"); setGap(_gap); } @@ -117,7 +113,7 @@ package org.apache.royale.jewel.beads.layouts COMPILE::JS private function setGap(value:Boolean):void { - value ? hostClassList.add("gap") : hostClassList.remove("gap"); + value ? hostComponent.addClass("gap") : hostComponent.removeClass("gap"); } // protected var _gap:Number = 0; @@ -158,10 +154,10 @@ package org.apache.royale.jewel.beads.layouts // { // if (value >= 0 && value <= 20) // { - // if (hostClassList.contains("gap-" + _gap + "dp")) - // hostClassList.remove("gap-" + _gap + "dp"); + // if (hostComponent.containsClass("gap-" + _gap + "dp")) + // hostComponent.removeClass("gap-" + _gap + "dp"); // if(value != 0) - // hostClassList.add("gap-" + value + "dp"); + // hostComponent.addClass("gap-" + value + "dp"); // } else // throw new Error("Grid gap needs to be between 0 and 20"); // } 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 12a555a..c2169c7 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 @@ -24,10 +24,6 @@ package org.apache.royale.jewel.beads.layouts import org.apache.royale.core.ILayoutView; import org.apache.royale.core.layout.EdgeData; } - // COMPILE::JS { - // import org.apache.royale.core.UIBase; - // import org.apache.royale.core.WrappedHTMLElement; - // } import org.apache.royale.core.IUIBase; import org.apache.royale.core.ValuesManager; import org.apache.royale.core.layout.ILayoutStyleProperties; @@ -79,9 +75,9 @@ package org.apache.royale.jewel.beads.layouts COMPILE::JS { - if(hostClassList.contains("centered")) - hostClassList.remove("centered"); - hostClassList.add("centered"); + if(hostComponent.containsClass("centered")) + hostComponent.removeClass("centered"); + hostComponent.addClass("centered"); applyStyleToLayout(hostComponent, "gap"); setGap(_gap); @@ -127,9 +123,9 @@ package org.apache.royale.jewel.beads.layouts // private function setGap(value:Boolean):void // { // if (value) - // hostClassList.add("gap"); + // hostComponent.addClass("gap"); // else - // hostClassList.remove("gap"); + // hostComponent.removeClass("gap"); // } /** @@ -204,10 +200,10 @@ package org.apache.royale.jewel.beads.layouts { if (value >= 0 && value <= GapConstants.GAPS) { - if (hostClassList.contains("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px")) - hostClassList.remove("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px"); + if (hostComponent.containsClass("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px")) + hostComponent.removeClass("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px"); if(value != 0) - hostClassList.add("gap-" + value + "x" + GapConstants.GAP_STEP + "px"); + hostComponent.addClass("gap-" + value + "x" + GapConstants.GAP_STEP + "px"); } else throw new Error("Gap needs to be between 0 and " + GapConstants.GAPS); } 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 79b2021..812d58f 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 @@ -24,10 +24,6 @@ package org.apache.royale.jewel.beads.layouts import org.apache.royale.core.ILayoutView; import org.apache.royale.core.layout.EdgeData; } - // COMPILE::JS { - // import org.apache.royale.core.UIBase; - // import org.apache.royale.core.WrappedHTMLElement; - // } import org.apache.royale.core.IUIBase; import org.apache.royale.core.ValuesManager; import org.apache.royale.core.layout.ILayoutStyleProperties; @@ -79,9 +75,9 @@ package org.apache.royale.jewel.beads.layouts COMPILE::JS { - if(hostClassList.contains("flow")) - hostClassList.remove("flow"); - hostClassList.add("flow"); + if(hostComponent.containsClass("flow")) + hostComponent.removeClass("flow"); + hostComponent.addClass("flow"); applyStyleToLayout(hostComponent, "gap"); setGap(_gap); @@ -127,9 +123,9 @@ package org.apache.royale.jewel.beads.layouts // private function setGap(value:Boolean):void // { // if (value) - // hostClassList.add("gap"); + // hostComponent.addClass("gap"); // else - // hostClassList.remove("gap"); + // hostComponent.removeClass("gap"); // } /** @@ -203,10 +199,10 @@ package org.apache.royale.jewel.beads.layouts { if (value >= 0 && value <= GapConstants.GAPS) { - if (hostClassList.contains("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px")) - hostClassList.remove("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px"); + if (hostComponent.containsClass("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px")) + hostComponent.removeClass("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px"); if(value != 0) - hostClassList.add("gap-" + value + "x" + GapConstants.GAP_STEP + "px"); + hostComponent.addClass("gap-" + value + "x" + GapConstants.GAP_STEP + "px"); } else throw new Error("Gap needs to be between 0 and " + GapConstants.GAPS); } diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as index ec312f6..3ffaeb2 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as @@ -120,9 +120,9 @@ package org.apache.royale.jewel.beads.layouts // private function setGap(value:Boolean):void // { // if (value) - // hostClassList.add("gap"); + // hostComponent.addClass("gap"); // else - // hostClassList.remove("gap"); + // hostComponent.removeClass("gap"); // } /** @@ -201,10 +201,10 @@ package org.apache.royale.jewel.beads.layouts { if (value >= 0 && value <= GapConstants.GAPS) { - if (hostClassList.contains("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px")) - hostClassList.remove("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px"); + if (hostComponent.containsClass("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px")) + hostComponent.removeClass("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px"); if(value != 0) - hostClassList.add("gap-" + value + "x" + GapConstants.GAP_STEP + "px"); + hostComponent.addClass("gap-" + value + "x" + GapConstants.GAP_STEP + "px"); } else throw new Error("Gap needs to be between 0 and " + GapConstants.GAPS); } @@ -242,7 +242,7 @@ package org.apache.royale.jewel.beads.layouts COMPILE::JS private function setVariableRowHeight(value:Boolean):void { - hostClassList.toggle("variableRowHeight", value); + hostComponent.toggleClass("variableRowHeight", value); } /** 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 b942c58..06f09e4 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 @@ -83,12 +83,12 @@ package org.apache.royale.jewel.beads.layouts COMPILE::JS { - if (hostClassList.contains("layout")) - hostClassList.remove("layout"); - hostClassList.add("layout"); - if(hostClassList.contains("horizontal")) - hostClassList.remove("horizontal"); - hostClassList.add("horizontal"); + if (hostComponent.containsClass("layout")) + hostComponent.removeClass("layout"); + hostComponent.addClass("layout"); + if(hostComponent.containsClass("horizontal")) + hostComponent.removeClass("horizontal"); + hostComponent.addClass("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 3285b44..ffbe408 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 @@ -84,12 +84,12 @@ package org.apache.royale.jewel.beads.layouts COMPILE::JS { - if (hostClassList.contains("layout")) - hostClassList.remove("layout"); - hostClassList.add("layout"); - if(hostClassList.contains("vertical")) - hostClassList.remove("vertical"); - hostClassList.add("vertical"); + if (hostComponent.containsClass("layout")) + hostComponent.removeClass("layout"); + hostComponent.addClass("layout"); + if(hostComponent.containsClass("vertical")) + hostComponent.removeClass("vertical"); + hostComponent.addClass("vertical"); } } diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as index 18809ca..3a51de8 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as @@ -21,11 +21,11 @@ package org.apache.royale.jewel.beads.layouts import org.apache.royale.core.IStrand; import org.apache.royale.core.IUIBase; import org.apache.royale.core.LayoutBase; - import org.apache.royale.core.UIBase; + import org.apache.royale.core.StyledUIBase; import org.apache.royale.core.ValuesManager; + import org.apache.royale.core.layout.ILayoutStyleProperties; import org.apache.royale.events.Event; import org.apache.royale.events.IEventDispatcher; - import org.apache.royale.core.layout.ILayoutStyleProperties; /** * The StyledLayoutBase class is an extension of LayoutBase @@ -57,10 +57,7 @@ package org.apache.royale.jewel.beads.layouts */ public static const LAYOUT_TYPE_NAMES:String = ""; - protected var hostComponent:UIBase; - - COMPILE::JS - protected var hostClassList:DOMTokenList; + protected var hostComponent:StyledUIBase; /** * @copy org.apache.royale.core.IBead#strand @@ -75,13 +72,7 @@ package org.apache.royale.jewel.beads.layouts override public function set strand(value:IStrand):void { super.strand = value; - - COMPILE::JS - { - hostComponent = host as UIBase; - hostClassList = hostComponent.positioner.classList; - } - + hostComponent = host as StyledUIBase; IEventDispatcher(value).addEventListener("beadsAdded", beadsAddedHandler); beadsAddedHandler(); } @@ -101,13 +92,13 @@ package org.apache.royale.jewel.beads.layouts COMPILE::JS { applyStyleToLayout(hostComponent, "itemsExpand"); - setHostClassList("itemsExpand", _itemsExpand ? "itemsExpand":""); + setHostComponentClass("itemsExpand", _itemsExpand ? "itemsExpand":""); applyStyleToLayout(hostComponent, "itemsHorizontalAlign"); - setHostClassList(_itemsHorizontalAlign, _itemsHorizontalAlign); + setHostComponentClass(_itemsHorizontalAlign, _itemsHorizontalAlign); applyStyleToLayout(hostComponent, "itemsVerticalAlign"); - setHostClassList(_itemsVerticalAlign, _itemsVerticalAlign); + setHostComponentClass(_itemsVerticalAlign, _itemsVerticalAlign); } } @@ -175,7 +166,7 @@ package org.apache.royale.jewel.beads.layouts { COMPILE::JS { - setHostClassList(_itemsHorizontalAlign, value); + setHostComponentClass(_itemsHorizontalAlign, value); _itemsHorizontalAlign = value; itemsHorizontalAlignInitialized = true; } @@ -210,7 +201,7 @@ package org.apache.royale.jewel.beads.layouts { COMPILE::JS { - setHostClassList(_itemsVerticalAlign, value); + setHostComponentClass(_itemsVerticalAlign, value); _itemsVerticalAlign = value; itemsVerticalAlignInitialized = true; } @@ -240,7 +231,7 @@ package org.apache.royale.jewel.beads.layouts COMPILE::JS { - setHostClassList("itemsExpand", value ? "itemsExpand" : ""); + setHostComponentClass("itemsExpand", value ? "itemsExpand" : ""); _itemsExpand = value; itemsExpandInitialized = true; } @@ -248,15 +239,15 @@ package org.apache.royale.jewel.beads.layouts } COMPILE::JS - protected function setHostClassList(oldValue:String, newValue:String):void { + protected function setHostComponentClass(oldValue:String, newValue:String):void { if (!hostComponent) return; - if (oldValue && hostClassList.contains(oldValue)) { + if (oldValue && hostComponent.containsClass(oldValue)) { if (oldValue == newValue) return; - hostClassList.remove(oldValue); + hostComponent.removeClass(oldValue); } - if (newValue) hostClassList.add(newValue); + if (newValue) hostComponent.addClass(newValue); } } } 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 fb2efa7..d7b5fc1 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 @@ -18,13 +18,13 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.royale.jewel.beads.layouts { - COMPILE::JS { - import org.apache.royale.core.UIBase; - } - import org.apache.royale.core.ILayoutChild; + COMPILE::SWF { import org.apache.royale.core.ILayoutView; import org.apache.royale.core.IUIBase; + import org.apache.royale.core.ILayoutChild; + } import org.apache.royale.events.Event; + /** * The TableLayout class is a simple layout @@ -72,12 +72,12 @@ package org.apache.royale.jewel.beads.layouts COMPILE::JS { - if (hostClassList.contains("layout")) - hostClassList.remove("layout"); - hostClassList.add("layout"); - if(hostClassList.contains("table")) - hostClassList.remove("table"); - hostClassList.add("table"); + if (hostComponent.containsClass("layout")) + hostComponent.removeClass("layout"); + hostComponent.addClass("layout"); + if(hostComponent.containsClass("table")) + hostComponent.removeClass("table"); + hostComponent.addClass("table"); } } 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 7d74a34..1abcdaa 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 @@ -24,10 +24,6 @@ package org.apache.royale.jewel.beads.layouts import org.apache.royale.core.ILayoutView; import org.apache.royale.core.layout.EdgeData; } - // COMPILE::JS { - // import org.apache.royale.core.UIBase; - // import org.apache.royale.core.WrappedHTMLElement; - // } import org.apache.royale.core.IUIBase; import org.apache.royale.core.ValuesManager; import org.apache.royale.core.layout.ILayoutStyleProperties; @@ -79,9 +75,9 @@ package org.apache.royale.jewel.beads.layouts COMPILE::JS { - if(hostClassList.contains("centered")) - hostClassList.remove("centered"); - hostClassList.add("centered"); + if(hostComponent.containsClass("centered")) + hostComponent.removeClass("centered"); + hostComponent.addClass("centered"); applyStyleToLayout(hostComponent, "gap"); setGap(_gap); @@ -127,9 +123,9 @@ package org.apache.royale.jewel.beads.layouts // private function setGap(value:Boolean):void // { // if (value) - // hostClassList.add("gap"); + // hostComponent.addClass("gap"); // else - // hostClassList.remove("gap"); + // hostComponent.removeClass("gap"); // } /** @@ -203,10 +199,10 @@ package org.apache.royale.jewel.beads.layouts { if (value >= 0 && value <= GapConstants.GAPS) { - if (hostClassList.contains("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px")) - hostClassList.remove("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px"); + if (hostComponent.containsClass("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px")) + hostComponent.removeClass("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px"); if(value != 0) - hostClassList.add("gap-" + value + "x" + GapConstants.GAP_STEP + "px"); + hostComponent.addClass("gap-" + value + "x" + GapConstants.GAP_STEP + "px"); } else throw new Error("Gap needs to be between 0 and " + GapConstants.GAPS); } 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 fe1ae31..af1e8aa 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 @@ -24,10 +24,6 @@ package org.apache.royale.jewel.beads.layouts import org.apache.royale.core.ILayoutView; import org.apache.royale.core.layout.EdgeData; } - // COMPILE::JS { - // import org.apache.royale.core.UIBase; - // import org.apache.royale.core.WrappedHTMLElement; - // } import org.apache.royale.core.IUIBase; import org.apache.royale.core.ValuesManager; import org.apache.royale.core.layout.ILayoutStyleProperties; @@ -80,9 +76,9 @@ package org.apache.royale.jewel.beads.layouts COMPILE::JS { - if(hostClassList.contains("flow")) - hostClassList.remove("flow"); - hostClassList.add("flow"); + if(hostComponent.containsClass("flow")) + hostComponent.removeClass("flow"); + hostComponent.addClass("flow"); applyStyleToLayout(hostComponent, "gap"); setGap(_gap); @@ -128,9 +124,9 @@ package org.apache.royale.jewel.beads.layouts // private function setGap(value:Boolean):void // { // if (value) - // hostClassList.add("gap"); + // hostComponent.addClass("gap"); // else - // hostClassList.remove("gap"); + // hostComponent.removeClass("gap"); // } /** @@ -205,10 +201,10 @@ package org.apache.royale.jewel.beads.layouts { if (value >= 0 && value <= GapConstants.GAPS) { - if (hostClassList.contains("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px")) - hostClassList.remove("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px"); + if (hostComponent.containsClass("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px")) + hostComponent.removeClass("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px"); if(value != 0) - hostClassList.add("gap-" + value + "x" + GapConstants.GAP_STEP + "px"); + hostComponent.addClass("gap-" + value + "x" + GapConstants.GAP_STEP + "px"); } else throw new Error("Gap needs to be between 0 and " + GapConstants.GAPS); } diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as index a485840..b714911 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as @@ -120,9 +120,9 @@ package org.apache.royale.jewel.beads.layouts // private function setGap(value:Boolean):void // { // if (value) - // hostClassList.add("gap"); + // hostComponent.addClass("gap"); // else - // hostClassList.remove("gap"); + // hostComponent.removeClass("gap"); // } /** @@ -201,10 +201,10 @@ package org.apache.royale.jewel.beads.layouts { if (value >= 0 && value <= GapConstants.GAPS) { - if (hostClassList.contains("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px")) - hostClassList.remove("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px"); + if (hostComponent.containsClass("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px")) + hostComponent.removeClass("gap-" + _gap + "x" + GapConstants.GAP_STEP + "px"); if(value != 0) - hostClassList.add("gap-" + value + "x" + GapConstants.GAP_STEP + "px"); + hostComponent.addClass("gap-" + value + "x" + GapConstants.GAP_STEP + "px"); } else throw new Error("Gap needs to be between 0 and " + GapConstants.GAPS); } @@ -242,7 +242,7 @@ package org.apache.royale.jewel.beads.layouts COMPILE::JS private function setVariableRowHeight(value:Boolean):void { - hostClassList.toggle("variableRowHeight", value); + hostComponent.toggleClass("variableRowHeight", value); } /**
