This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/jewel-datefield-year-month
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to
refs/heads/feature/jewel-datefield-year-month by this push:
new 6d25d63 jewel-datechooser: update arrow navigations to suppor new
states
6d25d63 is described below
commit 6d25d637acd11819d9e1013a6cb7c82de25b73c1
Author: Carlos Rovira <[email protected]>
AuthorDate: Sat Mar 23 13:00:16 2019 +0100
jewel-datechooser: update arrow navigations to suppor new states
---
.../controllers/DateChooserMouseController.as | 30 ++++++++++++++++------
.../royale/jewel/beads/models/DateChooserModel.as | 4 +--
2 files changed, 24 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 a15e411..18b636b 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
@@ -92,14 +92,21 @@ package org.apache.royale.jewel.beads.controllers
{
event.preventDefault();
- var model:DateChooserModel =
_strand.getBeadByType(IBeadModel) as DateChooserModel;
var month:Number = model.displayedMonth - 1;
var year:Number = model.displayedYear;
- if (month < 0) {
- month = 11;
+
+ if(model.viewState == 0)
+ {
+ if (month < 0) {
+ month = 11;
+ year--;
+ }
+ model.displayedMonth = month;
+ } else if(model.viewState == 1) {
+ year = year - DateChooserModel.NUM_YEARS_VIEW;
+ } else {
year--;
}
- model.displayedMonth = month;
model.displayedYear = year;
}
@@ -110,14 +117,21 @@ package org.apache.royale.jewel.beads.controllers
{
event.preventDefault();
- var model:DateChooserModel =
_strand.getBeadByType(IBeadModel) as DateChooserModel;
var month:Number = model.displayedMonth + 1;
var year:Number = model.displayedYear;
- if (month >= 12) {
- month = 0;
+
+ if(model.viewState == 0)
+ {
+ if (month >= 12) {
+ month = 0;
+ year++;
+ }
+ model.displayedMonth = month;
+ } else if(model.viewState == 1) {
+ year = year + DateChooserModel.NUM_YEARS_VIEW;
+ } else {
year++;
}
- model.displayedMonth = month;
model.displayedYear = year;
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DateChooserModel.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DateChooserModel.as
index 01bc537..cf5d77e 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DateChooserModel.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DateChooserModel.as
@@ -288,7 +288,7 @@ package org.apache.royale.jewel.beads.models
} else if(viewState == 1)
{
i = 0;
- var yearNumber:int = new Date().getFullYear() -
NUM_YEARS_VIEW/2;
+ var yearNumber:int = displayedYear -
NUM_YEARS_VIEW/2;
while(i < NUM_YEARS_VIEW)
{
_years[i] = new Date(yearNumber + i++,
0, 1);
@@ -296,7 +296,7 @@ package org.apache.royale.jewel.beads.models
} else
{
i = 0;
- var monthNumber:int = new Date().getMonth();
+ var monthNumber:int = displayedMonth;
var numMonths:Number = 12;
while(i < numMonths)
{
