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 2021/01/02 14:23:29 UTC
[royale-asjs] branch develop updated:
jewel-DateChooserDateRangeRestriction: ensure no selection remains in dates
out of the range
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 ca895af jewel-DateChooserDateRangeRestriction: ensure no selection remains in dates out of the range
ca895af is described below
commit ca895af8de9a790abb3fa7e84f7a87e445be25ec
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sat Jan 2 15:23:20 2021 +0100
jewel-DateChooserDateRangeRestriction: ensure no selection remains in dates out of the range
---
.../controls/datechooser/DateChooserDateRangeRestriction.as | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
index 1a76d39..db4be5c 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
@@ -19,6 +19,7 @@
package org.apache.royale.jewel.beads.controls.datechooser
{
import org.apache.royale.core.IBead;
+ import org.apache.royale.core.ISelectableItemRenderer;
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
@@ -30,6 +31,7 @@ package org.apache.royale.jewel.beads.controls.datechooser
import org.apache.royale.jewel.supportClasses.table.TBodyContentArea;
import org.apache.royale.jewel.supportClasses.table.TableCell;
import org.apache.royale.jewel.supportClasses.table.TableRow;
+ import org.apache.royale.utils.getSelectionRenderBead;
/**
* Disable dates which are outside restriction provided by minDate and maxDate properties
@@ -189,6 +191,14 @@ package org.apache.royale.jewel.beads.controls.datechooser
else if(minDate && !maxDate)
// only minDate
disabled.disabled = itemTime > minTime ? false : true;
+
+ // ensure no selection remains in dates out of the range
+ if(disabled.disabled)
+ {
+ var selectionBead:ISelectableItemRenderer = getSelectionRenderBead(renderer);
+ if(selectionBead && selectionBead.selected)
+ selectionBead.selected = false;
+ }
}
}
}
\ No newline at end of file