Date: Added Hour, minute, second to date creation; Added logic to handle day overflow on year or month change; Fixed naming of monthname. Added tests for everything. Finish merge from master.

Sean Cady · jzaefferer · commit 69ab148171e3 · 2012-10-16T16:23:33.000-04:00
diff --git a/datepicker-rewrite/date.js b/datepicker-rewrite/date.js
@@ -6,14 +6,14 @@
  */
 (function( $, undefined ) {
 
-$.date = function ( datestring, formatstring ) {
+$.date = function( datestring, formatstring ) {
 	//TODO: Need to refactor $.date to be a constructor, move the methods to a prototype.
 	var calendar = Globalize.culture().calendar,
 		format = formatstring ? formatstring : calendar.patterns.d,
-		date = datestring ? Globalize.parseDate(datestring, format) : new Date();
+		date = datestring ? Globalize.parseDate( datestring, format ) : new Date();
 
 	if ( !date ) {
-		date = new Date()
+		date = new Date();
 	}
 
 	return {
@@ -35,18 +35,30 @@ $.date = function ( datestring, formatstring ) {
 			return this;
 		},
 		setDay: function( day ) {
-			date = new Date( date.getFullYear(), date.getMonth(), day );
+			date = new Date( date.getFullYear(), date.getMonth(), day, date.getHours(), date.getMinutes(), date.getSeconds() );
 			return this;
 		},
 		setMonth: function( month ) {
-			//TODO: Should update this to keep the time component (hour, min, sec) intact. Same for setYear and setFullDate.
-			//TODO: Do we want to do any special handling when switching to a month that causes the days to overflow?
-			date = new Date( date.getFullYear(), month, date.getDate());
+			// Overflow example:  Month is October 31 (yeah Halloween) and month is changed to April with 30 days,
+			// the new date will me May 1.  We will honor the month the user wants to set and if and overflow
+			// occurs, set to last day of month.
+			var days = date.getDay(), year = date.getFullYear();
+			if ( days > this.daysInMonth( year, month ) ) {
+				// Overflow
+				days = this.daysInMonth( year, month );
+			}
+			date = new Date( year, month, days, date.getHours(), date.getMinutes(), date.getSeconds() );
 			return this;
 		},
 		setYear: function( year ) {
-			//TODO: Same question as setMonth, but I suppose only for leap years.
-			date = new Date( year, date.getMonth(), date.getDate() );
+			var day = date.getDate(),
+				month = date.getMonth();
+			// Check if Leap, and February and day is 29th
+			if ( this.isLeapYear( year ) && month == 1 && day == 29 ) {
+				// set day to last day of February
+				day = this.daysInMonth( year, month );
+			}
+			date = new Date( year, month, day, date.getHours(), date.getMinutes(), date.getSeconds() );
 			return this;
 		},
 		setFullDate: function( year, month, day ) {
@@ -57,19 +69,19 @@ $.date = function ( datestring, formatstring ) {
 			var day = period == "D" ? date.getDate() + offset : date.getDate(),
 				month = period == "M" ? date.getMonth() + offset : date.getMonth(),
 				year = period == "Y" ? date.getFullYear() + offset : date.getFullYear();
-
+			// If not day, update the day to the new month and year
 			if ( period != "D" ) {
-				day = Math.max(1, Math.min( day, this.daysInMonth( year, month ) ) );
+				day = Math.max( 1, Math.min( day, this.daysInMonth( year, month ) ) );
 			}
-			date = new Date( year, month, day );
+			date = new Date( year, month, day, date.getHours(), date.getMinutes(), date.getSeconds() );
 			return this;
 		},
 		daysInMonth: function( year, month ) {
 			year = year || date.getFullYear();
 			month = month || date.getMonth();
 			return 32 - new Date( year, month, 32 ).getDate();
 		},
-		monthname: function() {
+		monthName: function() {
 			return calendar.months.names[ date.getMonth() ];
 		},
 		day: function() {
@@ -81,12 +93,16 @@ $.date = function ( datestring, formatstring ) {
 		year: function() {
 			return date.getFullYear();
 		},
+		isLeapYear: function( year ) {
+			year = year || date.getFullYear();
+			return new Date( year, 1, 29 ).getMonth() == 1;
+
+		},
 		weekdays: function() {
-			// TODO take firstDay into account
 			var result = [];
 			for ( var dow = 0; dow < 7; dow++ ) {
 				var day = ( dow + calendar.firstDay ) % 7;
-				result.push( {
+				result.push({
 					shortname: calendar.days.namesShort[ day ],
 					fullname: calendar.days.names[ day ]
 				});
@@ -98,7 +114,7 @@ $.date = function ( datestring, formatstring ) {
 				today = $.date(),
 				firstDayOfMonth = new Date( this.year(), date.getMonth(), 1 ).getDay(),
 				leadDays = ( firstDayOfMonth - calendar.firstDay + 7 ) % 7,
-				rows = Math.ceil( ( leadDays + this.daysInMonth() ) / 7),
+				rows = Math.ceil( ( leadDays + this.daysInMonth() ) / 7 ),
 				printDate = new Date( this.year(), date.getMonth(), 1 - leadDays );
 			for ( var row = 0; row < rows; row++ ) {
 				var week = result[ result.length ] = {
@@ -114,52 +130,52 @@ $.date = function ( datestring, formatstring ) {
 						today: today.equal( printDate )
 					};
 					day.render = day.selectable = !day.lead;
-					this.eachDay( day );
+					// TODO undefined in picker demos, fix it
+					// this.eachDay( day );
 					// TODO use adjust("D", 1)?
 					printDate.setDate( printDate.getDate() + 1 );
 				}
 			}
 			return result;
 		},
-		// specialzed for multi-month template, could be used in general
+		// specialized for multi-month template, could be used in general
 		months: function( add ) {
 			var result = [],
-				current = date.getMonth(),
-				self = this;
+				current = date.getMonth();
 			for ( var i = 0; i < add + 1; i++ ) {
 				result.push( this.clone() );
 				this.adjust( "M", 1 );
 			}
-			result[0].first = true;
-			result[result.length - 1].last = true;
-			date.setMonth(current);
+			result[ 0 ].first = true;
+			result[ result.length - 1 ].last = true;
+			date.setMonth( current );
 			return result;
 		},
-		iso8601Week: function( date ) {
+		iso8601Week: function(date) {
 			var checkDate = new Date( date.getTime() );
 			// Find Thursday of this week starting on Monday
 			checkDate.setDate( checkDate.getDate() + 4 - ( checkDate.getDay() || 7 ) );
 			var time = checkDate.getTime();
-			checkDate.setMonth( 0 ); // Compare with Jan 1
+			// Compare with Jan 1
+			checkDate.setMonth( 0 );
 			checkDate.setDate( 1 );
 			return Math.floor( Math.round( ( time - checkDate ) / 86400000) / 7 ) + 1;
 		},
 		select: function() {
 			this.selected = this.clone();
 			return this;
 		},
-		// TODO create new Date with year, month, day instead
 		clone: function() {
-			var result = $.date( this.format(), format );
-			result.eachDay = this.eachDay;
-			return result;
+			return $.date( new Date(date.getFullYear(), date.getMonth(),
+				date.getDate(), date.getHours(),
+				date.getMinutes(), date.getSeconds()), formatstring );
 		},
 		// TODO compare year, month, day each for better performance
 		equal: function( other ) {
 			function format( date ) {
 				return Globalize.format( date, "d" );
 			}
-			return format( date ) == format( other );
+			return format( date ) === format( other );
 		},
 		date: function() {
 			return date;
@@ -174,7 +190,7 @@ $.date = function ( datestring, formatstring ) {
 			}
 			return calendar;
 		}
-	}
-}
+	};
+};
 
 }( jQuery ));
diff --git a/datepicker-rewrite/index.html b/datepicker-rewrite/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 	<meta charset="utf-8">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.8.2.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
 	<script src="../ui/jquery.ui.widget.js"></script>
 	<script src="../ui/jquery.ui.button.js"></script>
diff --git a/tests/unit/date/all.html b/tests/unit/date/all.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>jQuery UI Date Test Suite</title>
+
+    <script src="../../../jquery-1.7.1.js"></script>
+
+    <link rel="stylesheet" href="../../../external/qunit.css">
+    <link rel="stylesheet" href="../subsuiteRunner.css">
+    <script src="../../../external/qunit.js"></script>
+    <script src="../subsuiteRunner.js"></script>
+    <script src="../subsuite.js"></script>
+
+    <script>
+        testAllVersions( "date" );
+    </script>
+</head>
+<body>
+
+<h1 id="qunit-header">jQuery UI Datepicker Test Suite</h1>
+<h2 id="qunit-banner"></h2>
+<div id="qunit-testrunner-toolbar"></div>
+<h2 id="qunit-userAgent"></h2>
+<ol id="qunit-tests"></ol>
+<div id="qunit-fixture">
+
+</div>
+</body>
+</html>
diff --git a/tests/unit/date/date.html b/tests/unit/date/date.html
@@ -0,0 +1,40 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<title>jQuery UI Date Test Suite</title>
+
+	<script src="../../jquery.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
+	<script>
+	TestHelpers.loadResources({
+		js: [
+			"datepicker-rewrite/date.js",
+			"external/globalize.js",
+			"external/globalize.culture.de-DE.js"
+		]
+	});
+	</script>
+
+	<script src="date_core.js"></script>
+
+	<script src="../swarminject.js"></script>
+</head>
+<body>
+
+<h1 id="qunit-header">jQuery UI Date Test Suite</h1>
+<h2 id="qunit-banner"></h2>
+<div id="qunit-testrunner-toolbar"></div>
+<h2 id="qunit-userAgent"></h2>
+<ol id="qunit-tests"></ol>
+<div id="qunit-fixture">
+
+	<div><input type="text" id="inp"><input type="text" id="alt"><div id="inl"></div></div>
+	<p><input type="text" id="inp2"></p>
+
+</div>
+</body>
+</html>
diff --git a/tests/unit/date/date_core.js b/tests/unit/date/date_core.js
