Merge branch 'master' of git://github.com/eternicode/bootstrap-datepicker into develop

lakenen · lakenen · commit c307ead603e0 · 2012-11-28T22:03:43.000-08:00
* 'master' of git://github.com/eternicode/bootstrap-datepicker: this fixes an issue with IE7 that causes a Expected identifier, string or numbererror in said browser. Impact on other browsers is 0. Remove extra comma Fix whitespace Document remove function Detach events and remove Datepicker object in remove function Extract event handler manip to separate functions Make force-parsing optional Force-parse invalid dates into valid input values when picker is hidden Use local date parts when building the default UTC date Remove debugging cruft >_< Actually, there's a better solution to that Prevent infinite loop with invalid values Prevent infinite loop on invalid month (fixes uxsolutions#224) Fix for uxsolutions#214: javascript error for ms locale in IE8 Add a remove function to the datepicker object
diff --git a/README.md b/README.md
@@ -170,6 +170,12 @@ String.  Default: 'en'
 
 The two-letter code of the language to use for month and day names.  These will also be used as the input's value (and subsequently sent to the server in the case of form submissions).  Currently ships with English ('en'), German ('de'), Brazilian ('br'), and Spanish ('es') translations, but others can be added (see I18N below).  If an unknown language code is given, English will be used.
 
+### forceParse
+
+Boolean.  Default: true
+
+Whether or not to force parsing of the input value when the picker is closed.  That is, when an invalid date is left in the input field by the user, the picker will forcibly parse that value, and set the input's value to the new, valid date, conforming to the given `format`.
+
 ## Markup
 
 Format a component.
@@ -185,6 +191,15 @@ Format a component.
 
 Initializes an datepicker.
 
+### remove
+
+Arguments: None
+
+Remove the datepicker.  Removes attached events, internal attached objects, and
+added HTML elements.
+
+    $('#datepicker').datepicker('remove');
+
 ### show
 
 Arguments: None
diff --git a/js/bootstrap-datepicker.js b/js/bootstrap-datepicker.js
@@ -48,25 +48,13 @@
 		if(this.component && this.component.length === 0)
 			this.component = false;
 
-		if (this.isInput) {
-			this.element.on({
-				focus: $.proxy(this.show, this),
-				keyup: $.proxy(this.update, this),
-				keydown: $.proxy(this.keydown, this)
-			});
-		} else {
-			if (this.component && this.hasInput){
-				// For components that are not readonly, allow keyboard nav
-				this.element.find('input').on({
-					focus: $.proxy(this.show, this),
-					keyup: $.proxy(this.update, this),
-					keydown: $.proxy(this.keydown, this)
-				});
+		this._attachEvents();
 
-				this.component.on('click', $.proxy(this.show, this));
-			} else {
-				this.element.on('click', $.proxy(this.show, this));
-			}
+		this.forceParse = true;
+		if ('forceParse' in options) {
+			this.forceParse = options.forceParse;
+		} else if ('dateForceParse' in this.element.data()) {
+			this.forceParse = this.element.data('date-force-parse');
 		}
 
 		$(document).on('mousedown', function (e) {
@@ -126,6 +114,53 @@
 	Datepicker.prototype = {
 		constructor: Datepicker,
 
+		_events: [],
+		_attachEvents: function(){
+			this._detachEvents();
+			if (this.isInput) {
+				this._events = [
+					[this.element, {
+						focus: $.proxy(this.show, this),
+						keyup: $.proxy(this.update, this),
+						keydown: $.proxy(this.keydown, this)
+					}]
+				];
+			}
+			else if (this.component && this.hasInput){
+				this._events = [
+					// For components that are not readonly, allow keyboard nav
+					[this.element.find('input'), {
+						focus: $.proxy(this.show, this),
+						keyup: $.proxy(this.update, this),
+						keydown: $.proxy(this.keydown, this)
+					}],
+					[this.component, {
+						click: $.proxy(this.show, this)
+					}]
+				];
+			}
+			else {
+				this._events = [
+					[this.element, {
+						click: $.proxy(this.show, this)
+					}]
+				];
+			}
+			for (var i=0, el, ev; i<this._events.length; i++){
+				el = this._events[i][0];
+				ev = this._events[i][1];
+				el.on(ev);
+			}
+		},
+		_detachEvents: function(){
+			for (var i=0, el, ev; i<this._events.length; i++){
+				el = this._events[i][0];
+				ev = this._events[i][1];
+				el.off(ev);
+			}
+			this._events = [];
+		},
+
 		show: function(e) {
 			this.picker.show();
 			this.height = this.component ? this.component.outerHeight() : this.element.outerHeight();
@@ -150,14 +185,27 @@
 			if (!this.isInput) {
 				$(document).off('mousedown', this.hide);
 			}
-			if (e && e.currentTarget.value)
+
+			if (
+				this.forceParse &&
+				(
+					this.isInput && this.element.val() ||
+					this.hasInput && this.element.find('input').val()
+				)
+			)
 				this.setValue();
 			this.element.trigger({
 				type: 'hide',
 				date: this.date
 			});
 		},
 
+		remove: function() {
+			this._detachEvents();
+			this.picker.remove();
+			delete this.element.data().datepicker;
+		},
+
 		getDate: function() {
 			var d = this.getUTCDate();
 			return new Date(d.getTime() + (d.getTimezoneOffset()*60000))
@@ -760,7 +808,7 @@
 				val, filtered, part;
 			setters_map['M'] = setters_map['MM'] = setters_map['mm'] = setters_map['m'];
 			setters_map['dd'] = setters_map['d'];
-			date = UTCDate(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), 0, 0, 0);
+			date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
 			if (parts.length == format.parts.length) {
 				for (var i=0, cnt = format.parts.length; i < cnt; i++) {
 					val = parseInt(parts[i], 10);
@@ -789,7 +837,7 @@
 				}
 				for (var i=0, s; i<setters_order.length; i++){
 					s = setters_order[i];
-					if (s in parsed)
+					if (s in parsed && !isNaN(parsed[s]))
 						setters_map[s](date, parsed[s])
 				}
 			}
diff --git a/js/locales/bootstrap-datepicker.bg.js b/js/locales/bootstrap-datepicker.bg.js
@@ -1,14 +1,14 @@
-/**
- * Bulgarian translation for bootstrap-datepicker
- * Apostol Apostolov <apostol.s.apostolov@gmail.com>
- */
-;(function($){
-	$.fn.datepicker.dates['bg'] = {
-		days: ["Неделя", "Понеделник", "Вторник", "Сряда", "Четвъртък", "Петък", "Събота", "Неделя"],
-		daysShort: ["Нед", "Пон", "Вто", "Сря", "Чет", "Пет", "Съб", "Нед"],
-		daysMin: ["Н", "П", "В", "С", "Ч", "П", "С", "Н"],
-		months: ["Януари", "Февруари", "Март", "Април", "Май", "Юни", "Юли", "Август", "Септември", "Октомври", "Ноември", "Декември"],
-		monthsShort: ["Ян", "Фев", "Мар", "Апр", "Май", "Юни", "Юли", "Авг", "Сеп", "Окт", "Ное", "Дек"],
-		today: "днес"
-	};
-}(jQuery));
+/**
+ * Bulgarian translation for bootstrap-datepicker
+ * Apostol Apostolov <apostol.s.apostolov@gmail.com>
+ */
+;(function($){
+	$.fn.datepicker.dates['bg'] = {
+		days: ["Неделя", "Понеделник", "Вторник", "Сряда", "Четвъртък", "Петък", "Събота", "Неделя"],
+		daysShort: ["Нед", "Пон", "Вто", "Сря", "Чет", "Пет", "Съб", "Нед"],
+		daysMin: ["Н", "П", "В", "С", "Ч", "П", "С", "Н"],
+		months: ["Януари", "Февруари", "Март", "Април", "Май", "Юни", "Юли", "Август", "Септември", "Октомври", "Ноември", "Декември"],
+		monthsShort: ["Ян", "Фев", "Мар", "Апр", "Май", "Юни", "Юли", "Авг", "Сеп", "Окт", "Ное", "Дек"],
+		today: "днес"
+	};
+}(jQuery));
diff --git a/js/locales/bootstrap-datepicker.kr.js b/js/locales/bootstrap-datepicker.kr.js
@@ -8,6 +8,6 @@
 		daysShort: ["일", "월", "화", "수", "목", "금", "토", "일"],
 		daysMin: ["일", "월", "화", "수", "목", "금", "토", "일"],
 		months: ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"],
-		monthsShort: ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"],
+		monthsShort: ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"]
 	};
 }(jQuery));
diff --git a/js/locales/bootstrap-datepicker.ms.js b/js/locales/bootstrap-datepicker.ms.js
@@ -8,7 +8,7 @@
 		daysShort: ["Aha", "Isn", "Sel", "Rab", "Kha", "Jum", "Sab", "Aha"],
 		daysMin: ["Ah", "Is", "Se", "Ra", "Kh", "Ju", "Sa", "Ah"],
 		months: ["Januari", "Februari", "Mac", "April", "Mei", "Jun", "Julai", "Ogos", "September", "Oktober", "November", "Disember"],
-		monthsShort: ["Jan", "Feb", "Mar", "Apr", "Mei", "Jun", "Jul", "Ogo", "Sep", "Okt", "Nov", "Dis"]
+		monthsShort: ["Jan", "Feb", "Mar", "Apr", "Mei", "Jun", "Jul", "Ogo", "Sep", "Okt", "Nov", "Dis"],
 		today: "Hari Ini"
 	};
 }(jQuery));
diff --git a/tests/suites/formats.js b/tests/suites/formats.js
@@ -193,3 +193,18 @@ test('Regression: End-of-month bug', patch_date(function(Date){
         .datepicker('setValue');
     equal(this.input.val(), '29-02-2012');
 }));
+
+test('Invalid formats are force-parsed into a valid date on tab', patch_date(function(Date){
+    Date.now = UTCDate(2012, 4, 31);
+    this.input
+        .val('44-44-4444')
+        .datepicker({format: 'yyyy-MM-dd'})
+        .focus();
+
+    this.input.trigger({
+        type: 'keydown',
+        keyCode: 9
+    });
+
+    equal(this.input.val(), '56-September-30');
+}));
diff --git a/tests/suites/keyboard_navigation/all.js b/tests/suites/keyboard_navigation/all.js
@@ -16,7 +16,7 @@ test('TAB hides picker', function(){
     var target;
 
     ok(this.picker.is(':visible'), 'Picker is visible');
-    
+
     this.input.trigger({
         type: 'keydown',
         keyCode: 9
diff --git a/tests/suites/mouse_navigation/all.js b/tests/suites/mouse_navigation/all.js
@@ -13,21 +13,21 @@ module('Mouse Navigation (All)', {
 });
 
 test('Clicking datepicker does not hide datepicker', function(){
-    ok(this.picker.is(':visible'), 'Picker is visible');    
+    ok(this.picker.is(':visible'), 'Picker is visible');
     this.picker.trigger('mousedown');
     ok(this.picker.is(':visible'), 'Picker is still visible');
 });
 
-test('Clicking outside datepicker hides datepicker', function(){   
+test('Clicking outside datepicker hides datepicker', function(){
     var $otherelement = $('<div />');
-    $('body').append($otherelement); 
+    $('body').append($otherelement);
 
-    ok(this.picker.is(':visible'), 'Picker is visible');   
-    this.input.trigger('click');         
-    ok(this.picker.is(':visible'), 'Picker is still visible');    
+    ok(this.picker.is(':visible'), 'Picker is visible');
+    this.input.trigger('click');
+    ok(this.picker.is(':visible'), 'Picker is still visible');
 
     $otherelement.trigger('mousedown');
     ok(this.picker.is(':not(:visible)'), 'Picker is hidden');
 
     $otherelement.remove();
-});
+});
