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:10:21 UTC

[royale-asjs] branch develop updated: jewel-datechooser; doc, cleaning and organization

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 d24b739  jewel-datechooser; doc, cleaning and organization
d24b739 is described below

commit d24b739c912bf7b508006ca17eb3d0eb7b3097b7
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Mar 24 16:10:13 2019 +0100

    jewel-datechooser; doc, cleaning and organization
---
 .../royale/jewel/beads/models/DateChooserModel.as  | 43 +++++++++++++---------
 .../royale/jewel/beads/views/DateChooserView.as    | 16 --------
 2 files changed, 26 insertions(+), 33 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 d7565c6..ae1b9ee 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
@@ -37,10 +37,7 @@ package org.apache.royale.jewel.beads.models
 	{
 		public function DateChooserModel()
 		{
-			// default displayed year and month to "today"
-			// var today:Date = new Date();
-			// displayedYear = today.getFullYear();
-			// displayedMonth = today.getMonth();
+			super();
 		}
 		
 		private var _strand:IStrand;
@@ -58,20 +55,7 @@ package org.apache.royale.jewel.beads.models
 			_strand = value;
 		}
 		
-		private var _dayNames:Array   = ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"];
-		private var _monthNames:Array = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
-		private var _displayedYear:Number;
-		private var _displayedMonth:Number;
-		private var _firstDayOfWeek:Number = 0;
-		private var _selectedDate:Date;
 		private var _viewState:int = 0;
-        
-		private var _months:Array = [];
-		public static const NUM_DAYS_VIEW:int = 42;
-        private var _days:Array;
-		public static const NUM_YEARS_VIEW:int = 24;
-		private var _years:Array = new Array(NUM_YEARS_VIEW);
-		
 		/**
 		 *  0 - days (calendar view): Select a day in a month calendar view, can navigate by months
 		 *  1 - years (year view): Select a year from a list of years, can navigate by group of years
@@ -93,6 +77,7 @@ package org.apache.royale.jewel.beads.models
 			dispatchEvent( new Event("viewStateChanged") );
 		}
 		
+		private var _dayNames:Array   = ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"];
 		/**
 		 *  An array of strings used to name the days of the week with Sunday being the
 		 *  first element of the array.
@@ -112,6 +97,7 @@ package org.apache.royale.jewel.beads.models
 			dispatchEvent( new Event("dayNamesChanged") );
 		}
 		
+		private var _monthNames:Array = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
 		/**
 		 *  An array of strings used to name the months of the year with January being
 		 *  the first element of the array.
@@ -131,6 +117,7 @@ package org.apache.royale.jewel.beads.models
 			dispatchEvent( new Event("monthNames") );
 		}
 		
+		private var _displayedYear:Number;
 		/**
 		 *  The year currently displayed by the DateChooser.
 		 *  
@@ -152,6 +139,7 @@ package org.apache.royale.jewel.beads.models
 			}
 		}
 		
+		private var _displayedMonth:Number;
 		/**
 		 *  The month currently displayed by the DateChooser.
 		 *  
@@ -173,6 +161,7 @@ package org.apache.royale.jewel.beads.models
 			}
 		}
 		
+		private var _firstDayOfWeek:Number = 0;
 		/**
 		 *  The index of the first day of the week, Sunday = 0.
 		 *  
@@ -194,6 +183,13 @@ package org.apache.royale.jewel.beads.models
 			}
 		}
 		
+		public static const NUM_DAYS_VIEW:int = 42;
+        private var _days:Array;
+		/**
+		 * The array of days in date form used in days view
+		 * the number of days in view comes from NUM_DAYS_VIEW
+		 * @return 
+		 */
         public function get days():Array
         {
             return _days;
@@ -206,6 +202,13 @@ package org.apache.royale.jewel.beads.models
             }
         }
         
+		public static const NUM_YEARS_VIEW:int = 24;
+		private var _years:Array = new Array(NUM_YEARS_VIEW);
+		/**
+		 * The array of year in date form used in year view
+		 * the number of years in view comes from NUM_YEARS_VIEW
+		 * @return 
+		 */
 		public function get years():Array
         {
             return _years;
@@ -218,6 +221,11 @@ package org.apache.royale.jewel.beads.models
             }
         }
 		
+		private var _months:Array = [];
+		/**
+		 * The array of 12 month in date form used in month view
+		 * @return 
+		 */
 		public function get months():Array
         {
             return _months;
@@ -230,6 +238,7 @@ package org.apache.royale.jewel.beads.models
             }
         }
 
+		private var _selectedDate:Date;
 		/**
 		 *  The currently selected date or null if no date has been selected.
 		 *  
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 ad7aa48..a8a9538 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
@@ -381,21 +381,5 @@ package org.apache.royale.jewel.beads.views
 		{
 			updateDisplay();
 		}
-		
-		/**
-		 * @private
-		 */
-		// private function viewStateModelChange(event:Event):void
-		// {
-		// 	changeDisplay();
-		// }
-
-		/**
-		 * @private
-		 */
-		// private function changeDisplay():void
-		// {
-
-		// }
 	}
 }