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 c64525f Revert "form & formitem changes"
c64525f is described below
commit c64525ffbb28fc272ccbc0cccc2adeca707f6734
Author: Carlos Rovira <[email protected]>
AuthorDate: Sat Feb 23 16:58:56 2019 +0100
Revert "form & formitem changes"
This reverts commit f6fc0e18c5307d6f0a0edb09b33ee4a8c0f675c3.
---
.../projects/Jewel/src/main/resources/defaults.css | 15 +--
.../Jewel/src/main/resources/jewel-manifest.xml | 2 -
.../royale/jewel/beads/layouts/FormItemLayout.as | 113 --------------------
.../royale/jewel/beads/layouts/FormLayout.as | 115 ---------------------
.../royale/jewel/beads/views/FormHeadingView.as | 1 -
.../royale/jewel/beads/views/FormItemView.as | 24 ++---
.../projects/Jewel/src/main/sass/_global.sass | 2 +-
.../src/main/sass/components/_formheading.sass | 4 -
.../Jewel/src/main/sass/components/_formitem.sass | 6 +-
.../Jewel/src/main/sass/components/_layout.sass | 15 ---
.../JewelTheme/src/main/resources/defaults.css | 13 +--
.../main/sass/components-primary/_formitem.sass | 15 +--
12 files changed, 22 insertions(+), 303 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 37e47c9..cc1a21a 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -116,7 +116,7 @@ j|DataContainer {
}
j|Form {
- IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.FormLayout");
+ IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout");
}
@media -royale-swf {
@@ -812,10 +812,6 @@ j|FooterBar {
.jewel.formheading {
line-height: 2em;
}
-.jewel.formheading .jewel.label.headingLabel {
- white-space: initial;
- flex: 1 1 auto;
-}
j|FormHeading {
IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout");
@@ -824,7 +820,7 @@ j|FormHeading {
}
j|FormItem {
- IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.FormItemLayout");
+ IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout");
IBeadView:
ClassReference("org.apache.royale.jewel.beads.views.FormItemView");
IBeadModel:
ClassReference("org.apache.royale.jewel.beads.models.FormItemModel");
IFormItemContentArea: ClassReference("org.apache.royale.jewel.Group");
@@ -931,10 +927,6 @@ j|Label {
.layout.horizontal.centered > * {
flex: 0 0 auto;
}
-.layout.horizontal.formitem {
- width: 100%;
- align-items: flex-start;
-}
.layout.horizontal.gap-1x3px > *:first-child {
margin: 0px;
}
@@ -1013,9 +1005,6 @@ j|Label {
flex-direction: column;
height: 100%;
}
-.layout.vertical.form {
- width: 100%;
-}
.layout.vertical.gap-1x3px > *:first-child {
margin: 0px;
}
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 265c2b6..bb7c340 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -147,8 +147,6 @@
<component id="SimpleVerticalLayout"
class="org.apache.royale.jewel.beads.layouts.SimpleVerticalLayout"/>
<component id="HorizontalLayout"
class="org.apache.royale.jewel.beads.layouts.HorizontalLayout"/>
<component id="VerticalLayout"
class="org.apache.royale.jewel.beads.layouts.VerticalLayout"/>
- <component id="FormLayout"
class="org.apache.royale.jewel.beads.layouts.FormLayout"/>
- <component id="FormItemLayout"
class="org.apache.royale.jewel.beads.layouts.FormItemLayout"/>
<component id="HorizontalCenteredLayout"
class="org.apache.royale.jewel.beads.layouts.HorizontalCenteredLayout"/>
<component id="VerticalCenteredLayout"
class="org.apache.royale.jewel.beads.layouts.VerticalCenteredLayout"/>
<component id="HorizontalFlowLayout"
class="org.apache.royale.jewel.beads.layouts.HorizontalFlowLayout"/>
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
deleted file mode 100644
index 8f58321..0000000
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/FormItemLayout.as
+++ /dev/null
@@ -1,113 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-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;
-
- /**
- * The BasicLayout class is a simple layout
- * bead. It takes the set of children and lays them out
- * as specified by CSS properties like left, right, top
- * and bottom.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public class FormItemLayout extends HorizontalLayout
- {
- /**
- * Constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function FormItemLayout()
- {
- super();
- }
-
- /**
- * @royalesuppresspublicvarwarning
- */
- public static const LAYOUT_TYPE_NAMES:String = "layout
formitem";
-
- /**
- * Add class selectors when the component is addedToParent
- * Otherwise component will not get the class selectors when
- * perform "removeElement" and then "addElement"
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- override public function beadsAddedHandler(event:Event =
null):void
- {
- super.beadsAddedHandler();
-
- COMPILE::JS
- {
- if(hostClassList.contains("formitem"))
- hostClassList.remove("formitem");
- hostClassList.add("formitem");
- }
- }
-
- /**
- * @copy org.apache.royale.core.IBeadLayout#layout
- * @royaleignorecoercion org.apache.royale.core.UIBase
- */
- override public function layout():Boolean
- {
- COMPILE::SWF
- {
- return true;
- }
-
- COMPILE::JS
- {
- /**
- * This Layout uses the following CSS rules
- * no code needed in JS for layout
- *
- * .layout {
- * display: flex;
- * }
- *
- * .layout.formitem {
- * width: 100%;
- * flex-wrap: wrap;
- * }
- */
-
- return true;
- }
- }
- }
-}
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
deleted file mode 100644
index 00ae316..0000000
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/FormLayout.as
+++ /dev/null
@@ -1,115 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-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;
-
- /**
- * The BasicLayout class is a simple layout
- * bead. It takes the set of children and lays them out
- * as specified by CSS properties like left, right, top
- * and bottom.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public class FormLayout extends VerticalLayout
- {
- /**
- * Constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function FormLayout()
- {
- super();
- }
-
- /**
- * @royalesuppresspublicvarwarning
- */
- public static const LAYOUT_TYPE_NAMES:String = "layout form";
-
- /**
- * Add class selectors when the component is addedToParent
- * Otherwise component will not get the class selectors when
- * perform "removeElement" and then "addElement"
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- override public function beadsAddedHandler(event:Event =
null):void
- {
- super.beadsAddedHandler();
-
- COMPILE::JS
- {
- if(hostClassList.contains("form"))
- hostClassList.remove("form");
- hostClassList.add("form");
- }
- }
-
- /**
- * @copy org.apache.royale.core.IBeadLayout#layout
- * @royaleignorecoercion org.apache.royale.core.UIBase
- */
- override public function layout():Boolean
- {
- COMPILE::SWF
- {
- // TO DO
- return true;
- }
-
- COMPILE::JS
- {
- /**
- * This Layout uses the following CSS rules
- * no code needed in JS for layout
- *
- * .layout {
- * display: flex;
- * }
- *
- * .layout.form {
- * width: 100%;
- * }
- *
- *
- */
-
- return true;
- }
- }
- }
-}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/FormHeadingView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/FormHeadingView.as
index da79e42..4a871e6 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/FormHeadingView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/FormHeadingView.as
@@ -108,7 +108,6 @@ package org.apache.royale.jewel.beads.views
if (headingLabel == null) {
headingLabel = createLabel(model.text);
- headingLabel.className="headingLabel";
}
if (headingLabel != null && headingLabel.parent ==
null) {
formHeading.addElement(headingLabel);
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/FormItemView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/FormItemView.as
index ac2b9c0..8cfaecb 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/FormItemView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/FormItemView.as
@@ -37,7 +37,6 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.jewel.beads.layouts.VerticalLayout;
import org.apache.royale.jewel.beads.models.FormItemModel;
import org.apache.royale.jewel.supportClasses.formitem.FormItemLayoutProxy;
- import org.apache.royale.jewel.HGroup;
/**
@@ -78,7 +77,7 @@ package org.apache.royale.jewel.beads.views
private var _contentArea:UIBase;
/**
- * The content area of the formItem.
+ * The content area of the formItem.
*
* @langversion 3.0
* @playerversion Flash 10.2
@@ -125,8 +124,9 @@ package org.apache.royale.jewel.beads.views
model.addEventListener("htmlChange", textChangeHandler);
model.addEventListener("requiredChange", requiredChangeHandler);
- // Look for a layout and/or viewport bead on the formItem's beads
list delcared in MXML.
- // If one is found, pull it off so it will not be added
permanently to the strand.
+ // Look for a layout and/or viewport bead on the formItem's beads
list. If one
+ // is found, pull it off so it will not be added
permanently
+ // to the strand.
var beads:Array = formItem.beads;
var transferLayoutBead:IBeadLayout;
var transferViewportBead:IViewport;
@@ -146,7 +146,7 @@ package org.apache.royale.jewel.beads.views
if (!_contentArea) {
var cls:Class = ValuesManager.valuesImpl.getValue(_strand,
"iFormItemContentArea");
_contentArea = new cls() as UIBase;
- _contentArea.className = "content";
+ // _contentArea.id = "content";
// add the layout bead to the content area.
if (transferLayoutBead)
@@ -168,14 +168,6 @@ package org.apache.royale.jewel.beads.views
}
// super.strand = value;
- var labelGroup:HGroup;
- if (labelGroup == null) {
- labelGroup = new HGroup();
- labelGroup.gap = 2;
- }
- if (labelGroup != null && labelGroup.parent == null) {
- (_strand as
IContainerBaseStrandChildrenHost).$addElement(labelGroup);
- }
if (textLabel == null) {
textLabel = createLabel(model.text);
@@ -183,7 +175,7 @@ package org.apache.royale.jewel.beads.views
textLabel.className = "formlabel";
}
if (textLabel != null && textLabel.parent == null) {
- labelGroup.addElement(textLabel);
+ (_strand as
IContainerBaseStrandChildrenHost).$addElement(textLabel);
textLabelAlign = new TextAlign();
textLabelAlign.align = model.labelAlign;
textLabel.addBead(textLabelAlign);
@@ -195,7 +187,7 @@ package org.apache.royale.jewel.beads.views
requiredLabel.className = "required";
}
if (requiredLabel != null && requiredLabel.parent ==
null) {
- labelGroup.addElement(requiredLabel);
+ (_strand as
IContainerBaseStrandChildrenHost).$addElement(requiredLabel);
}
if (contentArea.parent == null) {
@@ -233,7 +225,7 @@ package org.apache.royale.jewel.beads.views
{
var defaultContentAreaLayout:VerticalLayout = new
VerticalLayout();
defaultContentAreaLayout.gap = 3;
- // defaultContentAreaLayout.itemsHorizontalAlign =
"itemsCenter";
+ defaultContentAreaLayout.itemsHorizontalAlign =
"itemsCenter";
contentArea.addBead(defaultContentAreaLayout);
}
diff --git a/frameworks/projects/Jewel/src/main/sass/_global.sass
b/frameworks/projects/Jewel/src/main/sass/_global.sass
index a0f154a..a30c0f1 100644
--- a/frameworks/projects/Jewel/src/main/sass/_global.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_global.sass
@@ -115,7 +115,7 @@ j|DataContainer
IViewportModel:
ClassReference("org.apache.royale.html.beads.models.ViewportModel")
j|Form
- IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.FormLayout")
+ IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout")
@media -royale-swf
j|View
diff --git
a/frameworks/projects/Jewel/src/main/sass/components/_formheading.sass
b/frameworks/projects/Jewel/src/main/sass/components/_formheading.sass
index 3ad6f9e..d1a6fef 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_formheading.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_formheading.sass
@@ -27,10 +27,6 @@
.jewel.label.spacerLabel
.jewel.label.requiredSpacerLabel
-
- .jewel.label.headingLabel
- white-space: initial
- flex: 1 1 auto
j|FormHeading
IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout")
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_formitem.sass
b/frameworks/projects/Jewel/src/main/sass/components/_formitem.sass
index d71b327..5d390b6 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_formitem.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_formitem.sass
@@ -27,13 +27,9 @@
.jewel.label.required
- .content
- // border: 1px solid red
-
-
j|FormItem
- IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.FormItemLayout")
+ IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout")
IBeadView:
ClassReference("org.apache.royale.jewel.beads.views.FormItemView")
IBeadModel:
ClassReference("org.apache.royale.jewel.beads.models.FormItemModel")
IFormItemContentArea: ClassReference("org.apache.royale.jewel.Group")
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
index e6d19ac..4856561 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
@@ -66,13 +66,6 @@ $gap-size: 10px !default
> *
flex: 0 0 auto
- // FormItemLayout
- &.formitem
- width: 100%
- // flex-wrap: wrap
- align-items: flex-start
- // justify-content: center
-
@for $i from 1 through $gaps
&.gap-#{$i}x#{$gap-step}px
> *:first-child
@@ -99,14 +92,6 @@ $gap-size: 10px !default
flex-direction: column
height: 100%
- // FormLayout (consider for now Forms are always vertical)
- &.form
- width: 100%
-
- // FormItemLayout
- // &.formitem
- // width: 100%
-
@for $i from 1 through $gaps
&.gap-#{$i}x#{$gap-step}px
> *:first-child
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 262fe16..dcc71d5 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -524,20 +524,17 @@ j|FormHeading {
}
.jewel.formitem .jewel.label.formlabel {
- width: 120px;
- line-height: 2.75em;
+ width: 160px;
}
.jewel.formitem .jewel.label.required {
color: #EC1C24;
- font-size: 2.1em !important;
- width: 14px;
-}
-.jewel.formitem .content {
- width: 200px;
+ font-size: 1.6em !important;
+ width: 10px;
}
j|FormItem {
- gap: 2;
+ gap: 3;
+ itemsVerticalAlign: itemsCentered;
}
.fonticon.dark {
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_formitem.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_formitem.sass
index 5fedab8..d0f8209 100644
---
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_formitem.sass
+++
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_formitem.sass
@@ -24,18 +24,13 @@
.jewel.formitem
.jewel.label.formlabel
- width: 120px
- line-height: 2.75em
- // border: 1px solid
+ width: 160px
.jewel.label.required
color: $error-color
- font-size: 2.1em !important
- width: 14px
- // border: 1px solid
- .content
- width: 200px
+ font-size: 1.6em !important
+ width: 10px
j|FormItem
- gap: 2
- //itemsVerticalAlign: itemsCentered
\ No newline at end of file
+ gap: 3
+ itemsVerticalAlign: itemsCentered
\ No newline at end of file
