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 2019/03/25 19:17:33 UTC
[royale-asjs] branch develop updated: jewel-datechooser: fix typo
in new const for MINIMUM_YEAR and MAXIMUM_YEAR,
and make view reflect in viewselector de min and max year,
also MAXIMUM_YEAR now is actual year + 100
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 99bbd6a jewel-datechooser: fix typo in new const for MINIMUM_YEAR and MAXIMUM_YEAR, and make view reflect in viewselector de min and max year, also MAXIMUM_YEAR now is actual year + 100
99bbd6a is described below
commit 99bbd6a7739ab02e5ca3811fb272829441aa7f35
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Mon Mar 25 20:17:26 2019 +0100
jewel-datechooser: fix typo in new const for MINIMUM_YEAR and MAXIMUM_YEAR, and make view reflect in viewselector de min and max year, also MAXIMUM_YEAR now is actual year + 100
---
.../org/apache/royale/jewel/beads/models/DateChooserModel.as | 8 ++++----
.../royale/org/apache/royale/jewel/beads/views/DateChooserView.as | 7 +++++--
2 files changed, 9 insertions(+), 6 deletions(-)
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 f715302..0535327 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
@@ -139,8 +139,8 @@ package org.apache.royale.jewel.beads.models
}
}
- public static const MINIMUN_YEAR:int = 1900;
- public static const MAXIMUN_YEAR:int = 2100;
+ public static const MINIMUM_YEAR:int = 1900;
+ public static const MAXIMUM_YEAR:int = new Date().getFullYear() + 100;
private var navigateYearsChanged:Boolean;
private var _navigateYears:Number;
/**
@@ -159,7 +159,7 @@ package org.apache.royale.jewel.beads.models
}
public function set navigateYears(value:Number):void
{
- if (value != _navigateYears && (value >= MINIMUN_YEAR - NUM_YEARS_VIEW/2) && (value <= MAXIMUN_YEAR + NUM_YEARS_VIEW/2) ) {
+ if (value != _navigateYears && (value >= MINIMUM_YEAR - NUM_YEARS_VIEW/2) && (value <= MAXIMUM_YEAR + NUM_YEARS_VIEW/2) ) {
_navigateYears = value;
navigateYearsChanged = true;
updateCalendar();
@@ -347,7 +347,7 @@ package org.apache.royale.jewel.beads.models
{
i = 0;
var yearNumber:int = (navigateYearsChanged ? navigateYears : displayedYear ) - NUM_YEARS_VIEW/2;
- while(i < NUM_YEARS_VIEW)// && yearNumber <= MINIMUN_YEAR && yearNumber >= MAXIMUN_YEAR)
+ while(i < NUM_YEARS_VIEW)// && yearNumber <= MINIMUM_YEAR && yearNumber >= MAXIMUM_YEAR)
{
_years[i] = new Date(yearNumber + i++, displayedMonth, 1);
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as
index 804afa2..000109b 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as
@@ -238,7 +238,10 @@ package org.apache.royale.jewel.beads.views
} else if(model.viewState == 1)
{
// display "2016-2039"
- _viewSelector.text = String(model.navigateYears - DateChooserModel.NUM_YEARS_VIEW/2) + "-" + String(model.navigateYears + DateChooserModel.NUM_YEARS_VIEW/2 - 1);
+ var minyear:int = DateChooserModel.MINIMUM_YEAR > model.navigateYears - DateChooserModel.NUM_YEARS_VIEW/2 ? DateChooserModel.MINIMUM_YEAR : model.navigateYears - DateChooserModel.NUM_YEARS_VIEW/2;
+ var maxyear:int = DateChooserModel.MAXIMUM_YEAR < model.navigateYears + DateChooserModel.NUM_YEARS_VIEW/2 ? DateChooserModel.MAXIMUM_YEAR : model.navigateYears + DateChooserModel.NUM_YEARS_VIEW/2;
+
+ _viewSelector.text = String(minyear) + "-" + String(maxyear);
tableHeader.expandColumns = 4;
} else
{
@@ -333,7 +336,7 @@ package org.apache.royale.jewel.beads.views
currrentYearGroup[i] = {};
for(j = 0; j < columns.length; j++)
{
- if((model.years[yearIndex] as Date).getFullYear() >= DateChooserModel.MINIMUN_YEAR && (model.years[yearIndex]as Date).getFullYear() <= DateChooserModel.MAXIMUN_YEAR)
+ if((model.years[yearIndex] as Date).getFullYear() >= DateChooserModel.MINIMUM_YEAR && (model.years[yearIndex]as Date).getFullYear() <= DateChooserModel.MAXIMUM_YEAR)
{
currrentYearGroup[i]["d"+j] = model.years[yearIndex];
} else