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/24 15:12:34 UTC
[royale-asjs] branch develop updated: jewel-datechooser: show
selected year in year view and month in month view
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 8e0bb6f jewel-datechooser: show selected year in year view and month in month view
8e0bb6f is described below
commit 8e0bb6f526ff10a1a8e109690fe7bea463e8b96d
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Mar 24 16:12:27 2019 +0100
jewel-datechooser: show selected year in year view and month in month view
---
.../royale/jewel/beads/models/DateChooserModel.as | 19 +++++++++++++------
1 file changed, 13 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 ae1b9ee..e26a8a3 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
@@ -361,11 +361,11 @@ package org.apache.royale.jewel.beads.models
*/
public function getIndexForSelectedDate():Number
{
- var i:int,test:Date;
+ var i:int, test:Date;
if(viewState == 0 && _selectedDate)
{
var str:String = _selectedDate.toDateString();
- for(i=0; i < _days.length; i++) {
+ for(i = 0; i < _days.length; i++) {
test = _days[i] as Date;
if (test && test.toDateString() == str)
@@ -374,16 +374,23 @@ package org.apache.royale.jewel.beads.models
}
}
} else if(viewState == 1 && _displayedYear) {
- for(i=0; i < _years.length; i++) {
+ for(i = 0; i < _years.length; i++) {
test = _years[i] as Date;
- if (test && test.toDateString() == str)
+ if (test.getFullYear() == _displayedYear)
+ {
+ return i;
+ }
+ }
+ } else if(viewState == 2 && _displayedMonth) {
+ for(i = 0; i < _months.length; i++) {
+ test = _months[i] as Date;
+
+ if (test.getMonth() == _displayedMonth)
{
return i;
}
}
- } else {
-
}
return -1;