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 823fa38 jewel datefield: DateFieldDisabled added
823fa38 is described below
commit 823fa38f942f2303e4a22b1bbdc3b4bb56ceccbf
Author: Carlos Rovira <[email protected]>
AuthorDate: Mon Feb 18 15:27:47 2019 +0100
jewel datefield: DateFieldDisabled added
---
.../src/main/royale/DateComponentsPlayGround.mxml | 13 +++++
.../src/main/royale/DropDownListPlayGround.mxml | 2 +-
.../Jewel/src/main/resources/jewel-manifest.xml | 1 +
.../beads/controls/combobox/ComboBoxDisabled.as | 6 +--
.../DateFieldDisabled.as} | 55 +++++++++++++++++-----
.../JewelTheme/src/main/resources/defaults.css | 9 +++-
.../main/sass/components-primary/_datefield.sass | 10 +++-
7 files changed, 78 insertions(+), 18 deletions(-)
diff --git
a/examples/royale/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml
b/examples/royale/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml
index 77bb1f5..bfa1923 100644
--- a/examples/royale/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml
@@ -154,6 +154,19 @@ limitations under the License.
<j:Label multiline="true"
html="<strong>DateChooser selected date:</strong>
{dateChooserSelectedDate.selectedDate}" width="275"/>
</j:Card>
</j:GridCell>
+
+ <j:GridCell desktopNumerator="1" desktopDenominator="2"
tabletNumerator="1" tabletDenominator="2" phoneNumerator="1"
phoneDenominator="1">
+ <j:Card>
+ <html:H3 text="Jewel DateField Disabled"/>
+ <j:DateField>
+ <j:beads>
+ <j:DateFieldDisabled/>
+ <j:DateFieldTextPrompt
prompt="Disabled..."/>
+ </j:beads>
+ </j:DateField>
+
+ </j:Card>
+ </j:GridCell>
</j:Grid>
diff --git
a/examples/royale/TourDeJewel/src/main/royale/DropDownListPlayGround.mxml
b/examples/royale/TourDeJewel/src/main/royale/DropDownListPlayGround.mxml
index 8f70996..c3bc657 100644
--- a/examples/royale/TourDeJewel/src/main/royale/DropDownListPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/DropDownListPlayGround.mxml
@@ -246,7 +246,7 @@ limitations under the License.
<j:DropDownList
labelField="label" dataProvider="{listModel.avengers}">
<j:beads>
<j:Disabled
disabled="{disable_ddl.selected}"/>
-
<j:DropDownListTextPrompt prompt="Select Avengers..."/>
+
<j:DropDownListTextPrompt prompt="Disabled..."/>
</j:beads>
</j:DropDownList>
</j:GridCell>
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 4921b8e..bb7c340 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -129,6 +129,7 @@
<component id="SearchFilter"
class="org.apache.royale.jewel.beads.controls.combobox.SearchFilter"/>
<component id="DateFieldTextPrompt"
class="org.apache.royale.jewel.beads.controls.datefield.DateFieldTextPrompt"/>
<component id="SpanishDateComponentConfig"
class="org.apache.royale.jewel.beads.controls.datefield.SpanishDateComponentConfig"/>
+ <component id="DateFieldDisabled"
class="org.apache.royale.jewel.beads.controls.datefield.DateFieldDisabled"/>
<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/ComboBoxDisabled.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxDisabled.as
index b0d5b08..4212d99 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxDisabled.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxDisabled.as
@@ -21,9 +21,9 @@ package org.apache.royale.jewel.beads.controls.combobox
COMPILE::JS
{
import org.apache.royale.core.UIBase;
+ import org.apache.royale.jewel.beads.views.ComboBoxView;
}
import org.apache.royale.jewel.beads.controls.Disabled;
- import org.apache.royale.jewel.beads.views.ComboBoxView;
/**
* The ComboBoxDisabled bead class is a specialty bead that can be
used to disable a Jewel ComboBox.
@@ -31,7 +31,7 @@ COMPILE::JS
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.4
+ * @productversion Royale 0.9.6
*/
public class ComboBoxDisabled extends Disabled
{
@@ -41,7 +41,7 @@ COMPILE::JS
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.4
+ * @productversion Royale 0.9.6
*/
public function ComboBoxDisabled()
{
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxDisabled.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldDisabled.as
similarity index 52%
copy from
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxDisabled.as
copy to
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldDisabled.as
index b0d5b08..2cd9472 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxDisabled.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldDisabled.as
@@ -16,24 +16,24 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.beads.controls.combobox
+package org.apache.royale.jewel.beads.controls.datefield
{
COMPILE::JS
{
import org.apache.royale.core.UIBase;
+ import org.apache.royale.jewel.beads.views.DateFieldView;
}
import org.apache.royale.jewel.beads.controls.Disabled;
- import org.apache.royale.jewel.beads.views.ComboBoxView;
/**
- * The ComboBoxDisabled bead class is a specialty bead that can be
used to disable a Jewel ComboBox.
+ * The DateFieldDisabled bead class is a specialty bead that can be
used to disable a Jewel DateField.
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.4
+ * @productversion Royale 0.9.6
*/
- public class ComboBoxDisabled extends Disabled
+ public class DateFieldDisabled extends Disabled
{
/**
* constructor.
@@ -41,26 +41,57 @@ COMPILE::JS
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.4
+ * @productversion Royale 0.9.6
*/
- public function ComboBoxDisabled()
+ public function DateFieldDisabled()
{
}
+ /**
+ * @copy org.apache.royale.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.4
+ * @royaleignorecoercion HTMLInputElement
+ * @royaleignorecoercion org.apache.royale.core.UIBase;
+ */
+ // override public function set strand(value:IStrand):void
+ // {
+ // _strand = value;
+
+ // COMPILE::JS
+ // {
+ // if (DateField(value).numElements ==2) {
+ // updateHost();
+ // } else {
+ // DateField(value).addEventListener('beadsAdded',
onBeadsAdded);
+ // }
+ // }
+ // }
+
+ // COMPILE::JS
+ // private function onBeadsAdded(event:Event):void
+ // {
+ // DateField(_strand).removeEventListener('beadsAdded',
onBeadsAdded);
+ // updateHost();
+ // }
+
COMPILE::JS
override protected function updateHost():void
{
super.updateHost();
- var view:ComboBoxView = (_strand as UIBase).view as
ComboBoxView;
+ var view:DateFieldView = (_strand as UIBase).view as
DateFieldView;
if (view) {
if(disabled) {
-
view.textinput.element.setAttribute('disabled', '');
-
view.button.element.setAttribute('disabled', '');
+
view.textInput.element.setAttribute('disabled', '');
+
view.menuButton.element.setAttribute('disabled', '');
} else {
-
view.textinput.element.removeAttribute('disabled');
-
view.button.element.removeAttribute('disabled');
+
view.textInput.element.removeAttribute('disabled');
+
view.menuButton.element.removeAttribute('disabled');
}
}
}
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 469cf74..7599844 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -354,7 +354,14 @@ j|Card {
}
.jewel.datefield .jewel.button::after {
background-size: 66%;
- background: url("data:image/svg+xml,%3Csvg viewBox='0 0 22 22' version='1.1'
xmlns='http://www.w3.org/2000/svg'%3E%3Cg stroke='none' stroke-width='1'
fill='none' fill-rule='evenodd'%3E%3Crect x='0' y='0' width='22'
height='22'%3E%3C/rect%3E%3Cpath d='M18.3333333,2.75 L17.4166667,2.75
L17.4166667,0.916666667 L15.5833333,0.916666667 L15.5833333,2.75
L6.41666667,2.75 L6.41666667,0.916666667 L4.58333333,0.916666667
L4.58333333,2.75 L3.66666667,2.75 C2.65833333,2.75 1.83333333,3.575 1.83333
[...]
+ background: url("data:image/svg+xml,%3Csvg viewBox='0 0 22 22' version='1.1'
xmlns='http://www.w3.org/2000/svg'%3E%3Cg stroke='none' stroke-width='1'
fill='none' fill-rule='evenodd'%3E%3Crect x='0' y='0' width='22'
height='22'%3E%3C/rect%3E%3Cpath d='M18.3333333,2.75 L17.4166667,2.75
L17.4166667,0.916666667 L15.5833333,0.916666667 L15.5833333,2.75
L6.41666667,2.75 L6.41666667,0.916666667 L4.58333333,0.916666667
L4.58333333,2.75 L3.66666667,2.75 C2.65833333,2.75 1.83333333,3.575 1.83333
[...]
+}
+.jewel.datefield .jewel.button[disabled] {
+ border-left: 0px !important;
+}
+.jewel.datefield .jewel.button[disabled]::after {
+ background-size: 66%;
+ background: url("data:image/svg+xml,%3Csvg viewBox='0 0 22 22' version='1.1'
xmlns='http://www.w3.org/2000/svg'%3E%3Cg stroke='none' stroke-width='1'
fill='none' fill-rule='evenodd'%3E%3Crect x='0' y='0' width='22'
height='22'%3E%3C/rect%3E%3Cpath d='M18.3333333,2.75 L17.4166667,2.75
L17.4166667,0.916666667 L15.5833333,0.916666667 L15.5833333,2.75
L6.41666667,2.75 L6.41666667,0.916666667 L4.58333333,0.916666667
L4.58333333,2.75 L3.66666667,2.75 C2.65833333,2.75 1.83333333,3.575 1.83333
[...]
}
.jewel.divider {
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 6d16fb5..e01e3a0 100644
---
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datefield.sass
+++
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datefield.sass
@@ -38,4 +38,12 @@ $datefield-border-radius: $border-radius
&::after
background-size: 66%
- background: encodeSVG("<svg viewBox='0 0 22 22' version='1.1'
xmlns='http://www.w3.org/2000/svg'><g stroke='none' stroke-width='1'
fill='none' fill-rule='evenodd'><rect x='0' y='0' width='22'
height='22'></rect><path d='M18.3333333,2.75 L17.4166667,2.75
L17.4166667,0.916666667 L15.5833333,0.916666667 L15.5833333,2.75
L6.41666667,2.75 L6.41666667,0.916666667 L4.58333333,0.916666667
L4.58333333,2.75 L3.66666667,2.75 C2.65833333,2.75 1.83333333,3.575
1.83333333,4.58333333 L1.833 [...]
+ background: encodeSVG("<svg viewBox='0 0 22 22' version='1.1'
xmlns='http://www.w3.org/2000/svg'><g stroke='none' stroke-width='1'
fill='none' fill-rule='evenodd'><rect x='0' y='0' width='22'
height='22'></rect><path d='M18.3333333,2.75 L17.4166667,2.75
L17.4166667,0.916666667 L15.5833333,0.916666667 L15.5833333,2.75
L6.41666667,2.75 L6.41666667,0.916666667 L4.58333333,0.916666667
L4.58333333,2.75 L3.66666667,2.75 C2.65833333,2.75 1.83333333,3.575
1.83333333,4.58333333 L1.833 [...]
+
+ &[disabled]
+ border-left: 0px !important
+
+ &::after
+ background-size: 66%
+ background: encodeSVG("<svg viewBox='0 0 22 22' version='1.1'
xmlns='http://www.w3.org/2000/svg'><g stroke='none' stroke-width='1'
fill='none' fill-rule='evenodd'><rect x='0' y='0' width='22'
height='22'></rect><path d='M18.3333333,2.75 L17.4166667,2.75
L17.4166667,0.916666667 L15.5833333,0.916666667 L15.5833333,2.75
L6.41666667,2.75 L6.41666667,0.916666667 L4.58333333,0.916666667
L4.58333333,2.75 L3.66666667,2.75 C2.65833333,2.75 1.83333333,3.575
1.83333333,4.58333333 L1 [...]
+
