[royale-asjs] branch develop updated: jewel-daterangerestriction: Fix logic when both min and max dates are set

[carlosrovira]

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 e702f83  jewel-daterangerestriction: Fix logic when both min and max 
dates are set
     new 91e7c9b  Merge pull request #1085 from brianraymes/develop
e702f83 is described below

commit e702f83482a9be4cb7cd9bba8bf30fda864974ef
Author: Brian Raymes <brian.ray...@teotech.com>
AuthorDate: Thu Feb 25 11:50:19 2021 -0800

    jewel-daterangerestriction: Fix logic when both min and max dates are set
---
 .../beads/controls/datechooser/DateChooserDateRangeRestriction.as   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 1992f99..7036ddc 100755
--- 
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
@@ -223,7 +223,7 @@ package org.apache.royale.jewel.beads.controls.datechooser
                        if (model.viewState == 0) // Day view
                        {
                                if (minDate && maxDate)
-                                       disabled.disabled = 
isLessThanDay(rendererDate, minDate) && isLessThanDay(maxDate, rendererDate);
+                                       disabled.disabled = 
isLessThanDay(rendererDate, minDate) || isLessThanDay(maxDate, rendererDate);
                                else if (minDate)
                                        disabled.disabled = 
isLessThanDay(rendererDate, minDate);
                                else if (maxDate)
@@ -232,7 +232,7 @@ package org.apache.royale.jewel.beads.controls.datechooser
                        else if (model.viewState == 1) // Year view
                        {
                                if (minDate && maxDate)
-                                       disabled.disabled = 
isLessThanYear(rendererDate, minDate) && isLessThanYear(maxDate, rendererDate);
+                                       disabled.disabled = 
isLessThanYear(rendererDate, minDate) || isLessThanYear(maxDate, rendererDate);
                                else if (minDate)
                                        disabled.disabled = 
isLessThanYear(rendererDate, minDate);
                                else if (maxDate)
@@ -241,7 +241,7 @@ package org.apache.royale.jewel.beads.controls.datechooser
                        else if (model.viewState == 2) // Month view
                        {
                                if (minDate && maxDate)
-                                       disabled.disabled = 
isLessThanMonth(rendererDate, minDate) && isLessThanMonth(maxDate, 
rendererDate);
+                                       disabled.disabled = 
isLessThanMonth(rendererDate, minDate) || isLessThanMonth(maxDate, 
rendererDate);
                                else if (minDate)
                                        disabled.disabled = 
isLessThanMonth(rendererDate, minDate);
                                else if (maxDate)