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 2020/12/30 15:36:02 UTC
[royale-asjs] branch develop updated: jewel-DateRangeRestriction:
Run the enable/disable code when click on datechooser navigation buttons or
change selected date
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 1bc478e jewel-DateRangeRestriction: Run the enable/disable code when click on datechooser navigation buttons or change selected date
1bc478e is described below
commit 1bc478e928bec3e8bb7905181df8e7aa5a581f9c
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Wed Dec 30 16:35:47 2020 +0100
jewel-DateRangeRestriction: Run the enable/disable code when click on datechooser navigation buttons or change selected date
---
.../controllers/DateChooserMouseController.as | 3 +--
.../controls/datechooser/DateRangeRestriction.as | 25 +++++++++++++++-------
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/DateChooserMouseController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/DateChooserMouseController.as
index 7720df1..36e9fcb 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/DateChooserMouseController.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/DateChooserMouseController.as
@@ -23,7 +23,6 @@ package org.apache.royale.jewel.beads.controllers
import org.apache.royale.core.IBeadView;
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
- import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.MouseEvent;
import org.apache.royale.jewel.beads.models.DateChooserModel;
import org.apache.royale.jewel.beads.views.DateChooserView;
@@ -76,7 +75,7 @@ package org.apache.royale.jewel.beads.controllers
view.nextButton.addEventListener(MouseEvent.CLICK, nextButtonClickHandler);
view.viewSelector.addEventListener(MouseEvent.CLICK, viewSelectorClickHandler);
- IEventDispatcher(view.table).addEventListener(Event.CHANGE, tableHandler);
+ view.table.addEventListener(Event.CHANGE, tableHandler);
}
/**
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
index 94beccb..de7bc62 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
@@ -22,9 +22,9 @@ package org.apache.royale.jewel.beads.controls.datechooser
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.events.MouseEvent;
import org.apache.royale.jewel.beads.controls.Disabled;
import org.apache.royale.jewel.beads.itemRenderers.ITextItemRenderer;
- import org.apache.royale.jewel.beads.models.DateChooserModel;
import org.apache.royale.jewel.beads.views.DateChooserView;
import org.apache.royale.jewel.supportClasses.datechooser.DateChooserTable;
import org.apache.royale.jewel.supportClasses.table.TBodyContentArea;
@@ -114,11 +114,25 @@ package org.apache.royale.jewel.beads.controls.datechooser
_strand = value;
(_strand as IEventDispatcher).addEventListener("initComplete", handlerDateChooserInitComplete);
}
-
+
+ private var view:DateChooserView;
+ private var table:DateChooserTable;
+ private var tableContent:TBodyContentArea;
+
private function handlerDateChooserInitComplete(event:Event):void
{
(_strand as IEventDispatcher).removeEventListener("initComplete", handlerDateChooserInitComplete);
+ view = _strand.getBeadByType(DateChooserView) as DateChooserView;
+ view.previousButton.addEventListener(MouseEvent.CLICK, refreshDateRange);
+ view.nextButton.addEventListener(MouseEvent.CLICK, refreshDateRange);
+ view.viewSelector.addEventListener(MouseEvent.CLICK, refreshDateRange);
+
+ table = view.table;
+ view.table.addEventListener(Event.CHANGE, refreshDateRange);
+
+ tableContent = table.getBeadByType(TBodyContentArea) as TBodyContentArea;
+
refreshDateRange();
}
@@ -126,11 +140,6 @@ package org.apache.royale.jewel.beads.controls.datechooser
{
if (!minDate || !maxDate) return;
- var model:DateChooserModel = _strand.getBeadByType(DateChooserModel) as DateChooserModel;
- var dateChooserView:DateChooserView = _strand.getBeadByType(DateChooserView) as DateChooserView;
- var table:DateChooserTable = dateChooserView.table;
- var tableContent:TBodyContentArea = table.getBeadByType(TBodyContentArea) as TBodyContentArea;
-
var n:int = table.dataProvider.length;
for (var i:int = 0; i < tableContent.numElements; i++)
{
@@ -160,7 +169,7 @@ package org.apache.royale.jewel.beads.controls.datechooser
(renderer as IStrand).addBead(disabled);
}
- if ((minTime < itemTime) && (itemTime > maxTime))
+ if ((itemTime > minTime) && (itemTime > maxTime))
{
trace("disabling ", rendererDate.day, rendererDate.month, rendererDate.fullYear, " -- ", minDate.day, minDate.month, minDate.fullYear, " -- ", maxDate.day, maxDate.month, maxDate.fullYear);
disabled.disabled = true;