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 2018/09/06 16:54:43 UTC
[royale-asjs] branch develop updated: DateField TextPrompt
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 cdf25f5 DateField TextPrompt
cdf25f5 is described below
commit cdf25f562652c1ce4532157297cbd4965e1ac7b9
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Thu Sep 6 18:54:36 2018 +0200
DateField TextPrompt
---
.../src/main/royale/DateComponentsPlayGround.mxml | 12 ++++++++++--
.../projects/Jewel/src/main/resources/defaults.css | 3 +++
.../projects/Jewel/src/main/resources/jewel-manifest.xml | 1 +
.../jewel/beads/controls/combobox/ComboBoxTextPrompt.as | 4 ++--
.../DateFieldTextPrompt.as} | 16 ++++++++--------
.../Jewel/src/main/sass/components/_datefield.sass | 8 +++++---
.../themes/JewelTheme/src/main/resources/defaults.css | 1 -
.../src/main/sass/components-primary/_datefield.sass | 2 --
8 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/examples/royale/JewelExample/src/main/royale/DateComponentsPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/DateComponentsPlayGround.mxml
index 597ae41..3169461 100644
--- a/examples/royale/JewelExample/src/main/royale/DateComponentsPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/DateComponentsPlayGround.mxml
@@ -111,7 +111,11 @@ limitations under the License.
<html:H3 text="Jewel DateField (Default)"/>
<j:HGroup gap="3">
- <j:DateField id="dateFieldDefault" change="dateFieldDefaultChanged()"/>
+ <j:DateField id="dateFieldDefault" change="dateFieldDefaultChanged()">
+ <j:beads>
+ <j:DateFieldTextPrompt prompt="MM/DD/YYYY"/>
+ </j:beads>
+ </j:DateField>
<j:Button text="Select today" click="dateFieldToToday()" emphasis="primary"/>
</j:HGroup>
<j:Label id="dateFieldDefaultSelectedDate" multiline="true" html="<strong>DateField selected date:</strong> "/>
@@ -125,7 +129,11 @@ limitations under the License.
<html:H3 text="Jewel DateField (Spanish)"/>
<j:HGroup gap="3">
- <j:DateField id="dateFieldES" change="dateFieldESChanged()" beadsAdded="configDateFieldToES()"/>
+ <j:DateField id="dateFieldES" change="dateFieldESChanged()" beadsAdded="configDateFieldToES()">
+ <j:beads>
+ <j:DateFieldTextPrompt prompt="DD/MM/YYYY"/>
+ </j:beads>
+ </j:DateField>
<j:Button text="Selecciona Hoy" click="dateFieldESToToday()" emphasis="primary"/>
</j:HGroup>
<j:Label id="dateFieldESSelectedDate" multiline="true" html="<strong>DateField fecha seleccionada:</strong> "/>
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 47d2317..3fc72b1 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -428,6 +428,9 @@ j|DateChooser {
.jewel.datefield {
display: inline-flex;
}
+.jewel.datefield .jewel.textinput input {
+ width: 9.2em;
+}
.jewel.datefield .jewel.button::before {
margin: 0;
padding: 0;
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 6bc38dc..8683727 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -105,6 +105,7 @@
<component id="ResponsiveDrawer" class="org.apache.royale.jewel.beads.controls.drawer.ResponsiveDrawer"/>
<component id="ComboBoxTextPrompt" class="org.apache.royale.jewel.beads.controls.combobox.ComboBoxTextPrompt"/>
+ <component id="DateFieldTextPrompt" class="org.apache.royale.jewel.beads.controls.datefield.DateFieldTextPrompt"/>
<component id="TextPrompt" class="org.apache.royale.jewel.beads.controls.textinput.TextPrompt"/>
<component id="PasswordInput" class="org.apache.royale.jewel.beads.controls.textinput.PasswordInput"/>
<component id="MaxNumberCharacters" class="org.apache.royale.jewel.beads.controls.textinput.MaxNumberCharacters"/>
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxTextPrompt.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxTextPrompt.as
index 17f4933..2e7cc59 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxTextPrompt.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxTextPrompt.as
@@ -29,8 +29,8 @@ package org.apache.royale.jewel.beads.controls.combobox
import org.apache.royale.jewel.beads.controls.textinput.TextPrompt;
/**
- * The TextPrompt class is a specialty bead that can be used with
- * any TextInput control. The bead places a string into the input field
+ * The ComboBoxTextPrompt class is a specialty bead that can be used with
+ * any ComboBox control. The bead places a string into the sub TextInput component
* when there is no value associated with the text property.
*
* @langversion 3.0
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxTextPrompt.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldTextPrompt.as
similarity index 83%
copy from frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxTextPrompt.as
copy to frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldTextPrompt.as
index 17f4933..82fb55b 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxTextPrompt.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldTextPrompt.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.beads.controls.combobox
+package org.apache.royale.jewel.beads.controls.datefield
{
COMPILE::SWF
{
@@ -25,12 +25,12 @@ package org.apache.royale.jewel.beads.controls.combobox
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.jewel.beads.controls.combobox.IComboBoxView;
+ import org.apache.royale.jewel.beads.views.DateFieldView;
import org.apache.royale.jewel.beads.controls.textinput.TextPrompt;
/**
- * The TextPrompt class is a specialty bead that can be used with
- * any TextInput control. The bead places a string into the input field
+ * The DateFieldTextPrompt class is a specialty bead that can be used with
+ * any DateField control. The bead places a string into the sub TextInput component
* when there is no value associated with the text property.
*
* @langversion 3.0
@@ -38,7 +38,7 @@ package org.apache.royale.jewel.beads.controls.combobox
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public class ComboBoxTextPrompt extends TextPrompt
+ public class DateFieldTextPrompt extends TextPrompt
{
/**
* constructor.
@@ -48,7 +48,7 @@ package org.apache.royale.jewel.beads.controls.combobox
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public function ComboBoxTextPrompt()
+ public function DateFieldTextPrompt()
{
}
@@ -84,11 +84,11 @@ package org.apache.royale.jewel.beads.controls.combobox
{
IEventDispatcher(_strand).removeEventListener("beadsAdded", addPrompt);
- var viewBead:IComboBoxView = _strand.getBeadByType(IComboBoxView) as IComboBoxView;
+ var viewBead:DateFieldView = _strand.getBeadByType(DateFieldView) as DateFieldView;
COMPILE::JS
{
- var e:HTMLInputElement = viewBead.textinput.element as HTMLInputElement;
+ var e:HTMLInputElement = viewBead.textInput.element as HTMLInputElement;
e.placeholder = prompt;
}
}
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_datefield.sass b/frameworks/projects/Jewel/src/main/sass/components/_datefield.sass
index 466e3fa..e6854d5 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_datefield.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_datefield.sass
@@ -20,6 +20,7 @@
// Jewel DateField
// DateField variables
+$datefield-input-width: 9.2em
$datefield-button-size: 22px
$datefield-button-xoffset: calc(50% - #{$datefield-button-size/2})
$datefield-button-yoffset: calc(50% - #{$datefield-button-size/2})
@@ -31,9 +32,10 @@ $datechooser-item-min-heigh: 34px
.jewel.datefield
display: inline-flex
- // .jewel.textinput
- // input
-
+ .jewel.textinput
+ input
+ width: $datefield-input-width
+
.jewel.button
&::before
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index c8cc2df..4ca4faa 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -302,7 +302,6 @@ j|Card {
}
.jewel.datefield .jewel.textinput input {
- width: 8em;
border-radius: 0.25rem 0px 0px 0.25rem;
}
.jewel.datefield .jewel.button {
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datefield.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datefield.sass
index 357f9e3..6d16fb5 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datefield.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datefield.sass
@@ -20,14 +20,12 @@
// Jewel DateField
// DateField variables
-$datefield-input-width: 8em
$datefield-border-radius: $border-radius
.jewel.datefield
.jewel.textinput
input
- width: $datefield-input-width
border-radius: $datefield-border-radius 0px 0px $datefield-border-radius
.jewel.button