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 039d798 jewel-datechooser: select index in tablet depending on
selected date and view state
039d798 is described below
commit 039d7983e09ef1d8494d875cc43c939ea3141405
Author: Carlos Rovira <[email protected]>
AuthorDate: Sat Mar 23 13:01:15 2019 +0100
jewel-datechooser: select index in tablet depending on selected date and
view state
---
.../royale/jewel/beads/models/DateChooserModel.as | 37 +++++++++++++++-------
.../royale/jewel/beads/views/DateChooserView.as | 9 +-----
2 files changed, 26 insertions(+), 20 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 cf5d77e..2ec18fd 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
@@ -334,19 +334,32 @@ package org.apache.royale.jewel.beads.models
*/
public function getIndexForSelectedDate():Number
{
- if (!_selectedDate) return -1;
-
- var str:String = _selectedDate.toDateString();
-
- for(var i:int=0; i < _days.length; i++) {
- var test:Date = _days[i] as Date;
-
- if (test && test.toDateString() == str)
- {
- return i;
+ var i:int,test:Date;
+ if(viewState == 0 && _selectedDate)
+ {
+ var str:String = _selectedDate.toDateString();
+ for(i=0; i < _days.length; i++) {
+ test = _days[i] as Date;
+
+ if (test && test.toDateString() == str)
+ {
+ return i;
+ }
}
- }
- return -1;
+ } else if(viewState == 1 && _displayedYear) {
+ for(i=0; i < _years.length; i++) {
+ test = _years[i] as Date;
+
+ if (test && test.toDateString() == str)
+ {
+ return i;
+ }
+ }
+ } else {
+
+ }
+
+ return -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 58dde46..18ed775 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
@@ -358,14 +358,7 @@ package org.apache.royale.jewel.beads.views
private function selectCurrentDate():void
{
- if(model.viewState == 0)
- {
- _table.selectedIndex =
model.getIndexForSelectedDate();
- } else if(model.viewState == 1) {
-
- } else {
-
- }
+ _table.selectedIndex = model.getIndexForSelectedDate();
}
/**
