bootstrap-datepicker-rails 1.1.1.10 → 1.1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aefc172c79b26c84138f82f114ddf75028f31350
-  data.tar.gz: 31d9a76013ba1784ff145d141ec2790aac26b705
+  metadata.gz: 99299e78e0957b2b87bb99d342fa95a49ef0b2f5
+  data.tar.gz: 3b9269f54a83b589a6fcf485cb0b3f7ae91a85eb
 SHA512:
-  metadata.gz: 28758135ac49d1cdfc298a184fa9e71aeeb5d426e09e3bd7334342f7b03547a419b4e27361482a9aabefd04dac87cdafcb4914f29dbabefaf8ad4b65727973c1
-  data.tar.gz: 0df62ea0ae5093a7cd2d97a5a0ced900380071173263a6bd9a6423fa006bc5cd881b56055e80ee79a6a9ccc9a6dd2c113390c8c7b022b5523c7ad0702f8a708b
+  metadata.gz: 9ac85d9d6c09fbc265f8897a146fd78fa307943a17b8c17ed52910ef5fbf175e743cd52453691f9d0805a55fb4290765d721909fba182445ec7a4ab39455ed1e
+  data.tar.gz: ef4c4197fdd1a765a094e29e1773997cf7511edf8b7a88bd7d22c68031f0b10a31c4afdbb8e434e03baa7faebdc1cf68d2a20d2b47433fe2d17cc27233f29938

data/lib/bootstrap-datepicker-rails/version.rb

@@ -1,5 +1,5 @@
 module BootstrapDatepickerRails
   module Rails
-    VERSION = "1.1.1.10"
+    VERSION = "1.1.1.11"
   end
 end

data/vendor/assets/javascripts/bootstrap-datepicker/core.js

@@ -31,13 +31,62 @@
 		var today = new Date();
 		return UTCDate(today.getFullYear(), today.getMonth(), today.getDate());
 	}
+	function alias(method){
+		return function(){
+			return this[method].apply(this, arguments);
+		};
+	}
+
+	var DateArray = (function(){
+		var extras = {
+			get: function(i){
+				return this.slice(i)[0];
+			},
+			contains: function(d){
+				// Array.indexOf is not cross-browser;
+				// $.inArray doesn't work with Dates
+				var val = d && d.valueOf();
+				for (var i=0, l=this.length; i<l; i++)
+					if (this[i].valueOf() === val)
+						return i;
+				return -1;
+			},
+			remove: function(i){
+				this.splice(i,1);
+			},
+			replace: function(new_array){
+				if (!new_array)
+					return;
+				if (!$.isArray(new_array))
+					new_array = [new_array];
+				this.clear();
+				this.push.apply(this, new_array);
+			},
+			clear: function(){
+				this.splice(0);
+			},
+			copy: function(){
+				var a = new DateArray();
+				a.replace(this);
+				return a;
+			}
+		};
+
+		return function(){
+			var a = [];
+			a.push.apply(a, arguments);
+			$.extend(a, extras);
+			return a;
+		};
+	})();
 
 
 	// Picker object
 
 	var Datepicker = function(element, options) {
-		this.date = undefined;
+		this.dates = new DateArray();
 		this.viewDate = UTCToday();
+		this.focusDate = null;
 
 		this._process_options(options);
 
@@ -137,6 +186,16 @@
 
 			o.startView = Math.max(o.startView, o.minViewMode);
 
+			// true, false, or Number > 0
+			if (o.multidate !== true){
+				o.multidate = Number(o.multidate) || false;
+				if (o.multidate !== false)
+					o.multidate = Math.max(0, o.multidate);
+				else
+					o.multidate = 1;
+			}
+			o.multidateSeparator = String(o.multidateSeparator);
+
 			o.weekStart %= 7;
 			o.weekEnd = ((o.weekStart + 6) % 7);
 
@@ -204,17 +263,31 @@
 		_events: [],
 		_secondaryEvents: [],
 		_applyEvents: function(evs){
-			for (var i=0, el, ev; i<evs.length; i++){
+			for (var i=0, el, ch, ev; i<evs.length; i++){
 				el = evs[i][0];
-				ev = evs[i][1];
-				el.on(ev);
+				if (evs[i].length === 2){
+					ch = undefined;
+					ev = evs[i][1];
+				}
+				else if (evs[i].length === 3){
+					ch = evs[i][1];
+					ev = evs[i][2];
+				}
+				el.on(ev, ch);
 			}
 		},
 		_unapplyEvents: function(evs){
-			for (var i=0, el, ev; i<evs.length; i++){
+			for (var i=0, el, ev, ch; i<evs.length; i++){
 				el = evs[i][0];
-				ev = evs[i][1];
-				el.off(ev);
+				if (evs[i].length === 2){
+					ch = undefined;
+					ev = evs[i][1];
+				}
+				else if (evs[i].length === 3){
+					ch = evs[i][1];
+					ev = evs[i][2];
+				}
+				el.off(ev, ch);
 			}
 		},
 		_buildEvents: function(){
@@ -222,7 +295,10 @@
 				this._events = [
 					[this.element, {
 						focus: $.proxy(this.show, this),
-						keyup: $.proxy(function(){ this.update() }, this),
+						keyup: $.proxy(function(e){
+							if ($.inArray(e.keyCode, [27,37,39,38,40,32,13,9]) === -1)
+								this.update();
+						}, this),
 						keydown: $.proxy(this.keydown, this)
 					}]
 				];
@@ -232,7 +308,10 @@
 					// For components that are not readonly, allow keyboard nav
 					[this.element.find('input'), {
 						focus: $.proxy(this.show, this),
-						keyup: $.proxy(function(){ this.update() }, this),
+						keyup: $.proxy(function(e){
+							if ($.inArray(e.keyCode, [27,37,39,38,40,32,13,9]) === -1)
+								this.update();
+						}, this),
 						keydown: $.proxy(this.keydown, this)
 					}],
 					[this.component, {
@@ -250,6 +329,20 @@
 					}]
 				];
 			}
+			this._events.push(
+				// Component: listen for blur on element descendants
+				[this.element, '*', {
+					blur: $.proxy(function(e){
+						this._focused_from = e.target;
+					}, this)
+				}],
+				// Input: listen for blur on element
+				[this.element, {
+					blur: $.proxy(function(e){
+						this._focused_from = e.target;
+					}, this)
+				}]
+			);
 
 			this._secondaryEvents = [
 				[this.picker, {
@@ -288,35 +381,42 @@
 			this._unapplyEvents(this._secondaryEvents);
 		},
 		_trigger: function(event, altdate){
-			var date = altdate || this.date,
+			var date = altdate || this.dates.get(-1),
 				local_date = this._utc_to_local(date);
 
 			this.element.trigger({
 				type: event,
 				date: local_date,
-				format: $.proxy(function(altformat){
-					var format = altformat || this.o.format;
+				dates: $.map(this.dates, this._utc_to_local),
+				format: $.proxy(function(ix, format){
+					if (arguments.length === 0){
+						ix = this.dates.length - 1;
+						format = this.o.format;
+					}
+					else if (typeof ix === 'string'){
+						format = ix;
+						ix = this.dates.length - 1;
+					}
+					format = format || this.o.format;
+					var date = this.dates.get(ix);
 					return DPGlobal.formatDate(date, format, this.o.language);
 				}, this)
 			});
 		},
 
-		show: function(e) {
+		show: function(){
 			if (!this.isInline)
 				this.picker.appendTo('body');
 			this.picker.show();
-			this.height = this.component ? this.component.outerHeight() : this.element.outerHeight();
 			this.place();
 			this._attachSecondaryEvents();
-			if (e) {
-				e.preventDefault();
-			}
 			this._trigger('show');
 		},
 
 		hide: function(){
 			if(this.isInline) return;
 			if (!this.picker.is(':visible')) return;
+			this.focusDate = null;
 			this.picker.hide().detach();
 			this._detachSecondaryEvents();
 			this.viewMode = this.o.startView;
@@ -357,23 +457,37 @@
 			return utc && new Date(Date.UTC(utc.getUTCFullYear(), utc.getUTCMonth(), utc.getUTCDate()));
 		},
 
+		getDates: function(){
+			return $.map(this.dates, this._utc_to_local);
+		},
+
+		getUTCDates: function(){
+			return $.map(this.dates, function(d){ return new Date(d); });
+		},
+
 		getDate: function() {
 			return this._utc_to_local(this.getUTCDate());
 		},
 
 		getUTCDate: function() {
-			return this.date;
+			return new Date(this.dates.get(-1));
 		},
 
-		setDate: function(d) {
-			this.setUTCDate(this._local_to_utc(d));
+		setDates: function() {
+			this.update.apply(this, arguments);
+			this._trigger('changeDate');
+			this.setValue();
 		},
 
-		setUTCDate: function(d) {
-			this.date = d;
+		setUTCDates: function() {
+			this.update.apply(this, $.map(arguments, this._utc_to_local));
+			this._trigger('changeDate');
 			this.setValue();
 		},
 
+		setDate: alias('setDates'),
+		setUTCDate: alias('setUTCDates'),
+
 		setValue: function() {
 			var formatted = this.getFormattedDate();
 			if (!this.isInput) {
@@ -388,7 +502,11 @@
 		getFormattedDate: function(format) {
 			if (format === undefined)
 				format = this.o.format;
-			return DPGlobal.formatDate(this.date, format, this.o.language);
+
+			var lang = this.o.language;
+			return $.map(this.dates, function(d){
+				return DPGlobal.formatDate(d, format, lang);
+			}).join(this.o.multidateSeparator);
 		},
 
 		setStartDate: function(startDate){
@@ -419,7 +537,7 @@
 				scrollTop = $window.scrollTop();
 
 			var zIndex = parseInt(this.element.parents().filter(function() {
-							return $(this).css('z-index') != 'auto';
+							return $(this).css('z-index') !== 'auto';
 						}).first().css('z-index'))+10;
 			var offset = this.component ? this.component.parent().offset() : this.element.offset();
 			var height = this.component ? this.component.outerHeight(true) : this.element.outerHeight(false);
@@ -477,42 +595,55 @@
 		update: function(){
 			if (!this._allow_update) return;
 
-			var oldDate = this.date && new Date(this.date),
-				date, fromArgs = false;
+			var oldDates = this.dates.copy(),
+				dates = [],
+				fromArgs = false;
 			if(arguments.length) {
-				date = arguments[0];
-				if (date instanceof Date)
-					date = this._local_to_utc(date);
+				$.each(arguments, $.proxy(function(i, date){
+					if (date instanceof Date)
+						date = this._local_to_utc(date);
+					dates.push(date);
+				}, this));
 				fromArgs = true;
 			} else {
-				date = this.isInput ? this.element.val() : this.element.data('date') || this.element.find('input').val();
+				dates = this.isInput
+						? this.element.val()
+						: this.element.data('date') || this.element.find('input').val();
+				if (dates && this.o.multidate)
+					dates = dates.split(this.o.multidateSeparator);
+				else
+					dates = [dates];
 				delete this.element.data().date;
 			}
 
-			this.date = DPGlobal.parseDate(date, this.o.format, this.o.language);
-
-			if (this.date < this.o.startDate) {
+			dates = $.map(dates, $.proxy(function(date){
+				return DPGlobal.parseDate(date, this.o.format, this.o.language);
+			}, this));
+			dates = $.grep(dates, $.proxy(function(date){
+				return (
+					date < this.o.startDate ||
+					date > this.o.endDate ||
+					!date
+				);
+			}, this), true);
+			this.dates.replace(dates);
+
+			if (this.dates.length)
+				this.viewDate = new Date(this.dates.get(-1));
+			else if (this.viewDate < this.o.startDate)
 				this.viewDate = new Date(this.o.startDate);
-				this.date = new Date(this.o.startDate);
-			} else if (this.date > this.o.endDate) {
+			else if (this.viewDate > this.o.endDate)
 				this.viewDate = new Date(this.o.endDate);
-				this.date = new Date(this.o.endDate);
-			} else if (this.date) {
-				this.viewDate = new Date(this.date);
-				this.date = new Date(this.date);
-			} else {
-				this.date = undefined;
-			}
 
 			if (fromArgs) {
 				// setting date by clicking
 				this.setValue();
-			} else if (date) {
+			} else if (dates.length) {
 				// setting date by typing
-				if (oldDate && this.date && oldDate.getTime() !== this.date.getTime())
+				if (String(oldDates) !== String(this.dates))
 					this._trigger('changeDate');
 			}
-			if (!this.date && oldDate)
+			if (!this.dates.length && oldDates.length)
 				this._trigger('clearDate');
 
 			this.fill();
@@ -554,23 +685,23 @@
 			var cls = [],
 				year = this.viewDate.getUTCFullYear(),
 				month = this.viewDate.getUTCMonth(),
-				currentDate = this.date && this.date.valueOf(),
 				today = new Date();
-			if (date.getUTCFullYear() < year || (date.getUTCFullYear() == year && date.getUTCMonth() < month)) {
+			if (date.getUTCFullYear() < year || (date.getUTCFullYear() === year && date.getUTCMonth() < month)) {
 				cls.push('old');
-			} else if (date.getUTCFullYear() > year || (date.getUTCFullYear() == year && date.getUTCMonth() > month)) {
+			} else if (date.getUTCFullYear() > year || (date.getUTCFullYear() === year && date.getUTCMonth() > month)) {
 				cls.push('new');
 			}
+			if (this.focusDate && date.valueOf() === this.focusDate.valueOf())
+				cls.push('focused');
 			// Compare internal UTC date with local today, not UTC today
 			if (this.o.todayHighlight &&
-				date.getUTCFullYear() == today.getFullYear() &&
-				date.getUTCMonth() == today.getMonth() &&
-				date.getUTCDate() == today.getDate()) {
+				date.getUTCFullYear() === today.getFullYear() &&
+				date.getUTCMonth() === today.getMonth() &&
+				date.getUTCDate() === today.getDate()) {
 				cls.push('today');
 			}
-			if (date.valueOf() == currentDate) {
+			if (this.dates.contains(date) !== -1)
 				cls.push('active');
-			}
 			if (date.valueOf() < this.o.startDate || date.valueOf() > this.o.endDate ||
 				$.inArray(date.getUTCDay(), this.o.daysOfWeekDisabled) !== -1) {
 				cls.push('disabled');
@@ -579,7 +710,7 @@
 				if (date > this.range[0] && date < this.range[this.range.length-1]){
 					cls.push('range');
 				}
-				if ($.inArray(date.valueOf(), this.range) != -1){
+				if ($.inArray(date.valueOf(), this.range) !== -1){
 					cls.push('selected');
 				}
 			}
@@ -615,7 +746,7 @@
 			var html = [];
 			var clsName;
 			while(prevMonth.valueOf() < nextMonth) {
-				if (prevMonth.getUTCDay() == this.o.weekStart) {
+				if (prevMonth.getUTCDay() === this.o.weekStart) {
 					html.push('<tr>');
 					if(this.o.calendarWeeks){
 						// ISO 8601: First week contains first thursday.
@@ -654,29 +785,31 @@
 
 				clsName = $.unique(clsName);
 				html.push('<td class="'+clsName.join(' ')+'"' + (tooltip ? ' title="'+tooltip+'"' : '') + '>'+prevMonth.getUTCDate() + '</td>');
-				if (prevMonth.getUTCDay() == this.o.weekEnd) {
+				if (prevMonth.getUTCDay() === this.o.weekEnd) {
 					html.push('</tr>');
 				}
 				prevMonth.setUTCDate(prevMonth.getUTCDate()+1);
 			}
 			this.picker.find('.datepicker-days tbody').empty().append(html.join(''));
-			var currentYear = this.date && this.date.getUTCFullYear();
 
 			var months = this.picker.find('.datepicker-months')
 						.find('th:eq(1)')
 							.text(year)
 							.end()
 						.find('span').removeClass('active');
-			if (currentYear && currentYear == year) {
-				months.eq(this.date && this.date.getUTCMonth()).addClass('active');
-			}
+
+			$.each(this.dates, function(i, d){
+				if (d.getUTCFullYear() === year)
+					months.eq(d.getUTCMonth()).addClass('active');
+			});
+
 			if (year < startYear || year > endYear) {
 				months.addClass('disabled');
 			}
-			if (year == startYear) {
+			if (year === startYear) {
 				months.slice(0, startMonth).addClass('disabled');
 			}
-			if (year == endYear) {
+			if (year === endYear) {
 				months.slice(endMonth+1).addClass('disabled');
 			}
 
@@ -688,8 +821,19 @@
 									.end()
 								.find('td');
 			year -= 1;
+			var years = $.map(this.dates, function(d){ return d.getUTCFullYear(); }),
+				classes;
 			for (var i = -1; i < 11; i++) {
-				html += '<span class="year'+(i == -1 ? ' old' : i == 10 ? ' new' : '')+(currentYear == year ? ' active' : '')+(year < startYear || year > endYear ? ' disabled' : '')+'">'+year+'</span>';
+				classes = ['year'];
+				if (i === -1)
+					classes.push('old');
+				else if (i === 10)
+					classes.push('new');
+				if ($.inArray(year, years) !== -1)
+					classes.push('active');
+				if (year < startYear || year > endYear)
+					classes.push('disabled');
+				html += '<span class="' + classes.join(' ') + '">'+year+'</span>';
 				year += 1;
 			}
 			yearCont.html(html);
@@ -734,7 +878,7 @@
 			e.preventDefault();
 			var target = $(e.target).closest('span, td, th'),
 				year, month, day;
-			if (target.length == 1) {
+			if (target.length === 1) {
 				switch(target[0].nodeName.toLowerCase()) {
 					case 'th':
 						switch(target[0].className) {
@@ -743,7 +887,7 @@
 								break;
 							case 'prev':
 							case 'next':
-								var dir = DPGlobal.modes[this.viewMode].navStep * (target[0].className == 'prev' ? -1 : 1);
+								var dir = DPGlobal.modes[this.viewMode].navStep * (target[0].className === 'prev' ? -1 : 1);
 								switch(this.viewMode){
 									case 0:
 										this.viewDate = this.moveMonth(this.viewDate, dir);
@@ -763,7 +907,7 @@
 								date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
 
 								this.showMode(-2);
-								var which = this.o.todayBtn == 'linked' ? null : 'view';
+								var which = this.o.todayBtn === 'linked' ? null : 'view';
 								this._setDate(date, which);
 								break;
 							case 'clear':
@@ -820,7 +964,7 @@
 									month -= 1;
 								}
 							} else if (target.is('.new')) {
-								if (month == 11) {
+								if (month === 11) {
 									month = 0;
 									year += 1;
 								} else {
@@ -832,13 +976,34 @@
 						break;
 				}
 			}
+			if (this.picker.is(':visible') && this._focused_from){
+				$(this._focused_from).focus();
+			}
+			delete this._focused_from;
+		},
+
+		_toggle_multidate: function( date ) {
+			var ix = this.dates.contains(date);
+			if (!date){
+				this.dates.clear();
+			}
+			else if (ix !== -1){
+				this.dates.remove(ix);
+			}
+			else{
+				this.dates.push(date);
+			}
+			if (typeof this.o.multidate === 'number')
+				while (this.dates.length > this.o.multidate)
+					this.dates.remove(0);
 		},
 
 		_setDate: function(date, which){
-			if (!which || which == 'date')
-				this.date = date && new Date(date);
-			if (!which || which  == 'view')
+			if (!which || which === 'date')
+				this._toggle_multidate(date && new Date(date));
+			if (!which || which  === 'view')
 				this.viewDate = date && new Date(date);
+
 			this.fill();
 			this.setValue();
 			this._trigger('changeDate');
@@ -851,7 +1016,7 @@
 			if (element) {
 				element.change();
 			}
-			if (this.o.autoclose && (!which || which == 'date')) {
+			if (this.o.autoclose && (!which || which === 'date')) {
 				this.hide();
 			}
 		},
@@ -865,14 +1030,14 @@
 				mag = Math.abs(dir),
 				new_month, test;
 			dir = dir > 0 ? 1 : -1;
-			if (mag == 1){
-				test = dir == -1
+			if (mag === 1){
+				test = dir === -1
 					// If going back one month, make sure month is not current month
 					// (eg, Mar 31 -> Feb 31 == Feb 28, not Mar 02)
-					? function(){ return new_date.getUTCMonth() == month; }
+					? function(){ return new_date.getUTCMonth() === month; }
 					// If going forward one month, make sure month is as expected
 					// (eg, Jan 31 -> Feb 31 == Feb 28, not Mar 02)
-					: function(){ return new_date.getUTCMonth() != new_month; };
+					: function(){ return new_date.getUTCMonth() !== new_month; };
 				new_month = month + dir;
 				new_date.setUTCMonth(new_month);
 				// Dec -> Jan (12) or Jan -> Dec (-1) -- limit expected date to 0-11
@@ -886,7 +1051,7 @@
 				// ...then reset the day, keeping it in the new month
 				new_month = new_date.getUTCMonth();
 				new_date.setUTCDate(day);
-				test = function(){ return new_month != new_date.getUTCMonth(); };
+				test = function(){ return new_month !== new_date.getUTCMonth(); };
 			}
 			// Common date-resetting loop -- if date is beyond end of month, make it
 			// end of month
@@ -907,81 +1072,104 @@
 
 		keydown: function(e){
 			if (this.picker.is(':not(:visible)')){
-				if (e.keyCode == 27) // allow escape to hide and re-show picker
+				if (e.keyCode === 27) // allow escape to hide and re-show picker
 					this.show();
 				return;
 			}
 			var dateChanged = false,
-				dir, newDate, newViewDate;
+				dir, newDate, newViewDate,
+				focusDate = this.focusDate || this.viewDate;
 			switch(e.keyCode){
 				case 27: // escape
-					this.hide();
+					if (this.focusDate){
+						this.focusDate = null;
+						this.viewDate = this.dates.get(-1) || this.viewDate;
+						this.fill();
+					}
+					else
+						this.hide();
 					e.preventDefault();
 					break;
 				case 37: // left
 				case 39: // right
 					if (!this.o.keyboardNavigation) break;
-					dir = e.keyCode == 37 ? -1 : 1;
+					dir = e.keyCode === 37 ? -1 : 1;
 					if (e.ctrlKey){
-						newDate = this.moveYear(this.date || UTCToday(), dir);
-						newViewDate = this.moveYear(this.viewDate, dir);
+						newDate = this.moveYear(this.dates.get(-1) || UTCToday(), dir);
+						newViewDate = this.moveYear(focusDate, dir);
 						this._trigger('changeYear', this.viewDate);
 					} else if (e.shiftKey){
-						newDate = this.moveMonth(this.date || UTCToday(), dir);
-						newViewDate = this.moveMonth(this.viewDate, dir);
+						newDate = this.moveMonth(this.dates.get(-1) || UTCToday(), dir);
+						newViewDate = this.moveMonth(focusDate, dir);
 						this._trigger('changeMonth', this.viewDate);
 					} else {
-						newDate = new Date(this.date || UTCToday());
+						newDate = new Date(this.dates.get(-1) || UTCToday());
 						newDate.setUTCDate(newDate.getUTCDate() + dir);
-						newViewDate = new Date(this.viewDate);
-						newViewDate.setUTCDate(this.viewDate.getUTCDate() + dir);
+						newViewDate = new Date(focusDate);
+						newViewDate.setUTCDate(focusDate.getUTCDate() + dir);
 					}
 					if (this.dateWithinRange(newDate)){
-						this.date = newDate;
-						this.viewDate = newViewDate;
+						this.focusDate = this.viewDate = newViewDate;
 						this.setValue();
-						this.update();
+						this.fill();
 						e.preventDefault();
-						dateChanged = true;
 					}
 					break;
 				case 38: // up
 				case 40: // down
 					if (!this.o.keyboardNavigation) break;
-					dir = e.keyCode == 38 ? -1 : 1;
+					dir = e.keyCode === 38 ? -1 : 1;
 					if (e.ctrlKey){
-						newDate = this.moveYear(this.date || UTCToday(), dir);
-						newViewDate = this.moveYear(this.viewDate, dir);
+						newDate = this.moveYear(this.dates.get(-1) || UTCToday(), dir);
+						newViewDate = this.moveYear(focusDate, dir);
 						this._trigger('changeYear', this.viewDate);
 					} else if (e.shiftKey){
-						newDate = this.moveMonth(this.date || UTCToday(), dir);
-						newViewDate = this.moveMonth(this.viewDate, dir);
+						newDate = this.moveMonth(this.dates.get(-1) || UTCToday(), dir);
+						newViewDate = this.moveMonth(focusDate, dir);
 						this._trigger('changeMonth', this.viewDate);
 					} else {
-						newDate = new Date(this.date || UTCToday());
-						newDate.setUTCDate(this.date.getUTCDate() + dir * 7);
-						newViewDate = new Date(this.viewDate);
-						newViewDate.setUTCDate(this.viewDate.getUTCDate() + dir * 7);
+						newDate = new Date(this.dates.get(-1) || UTCToday());
+						newDate.setUTCDate(newDate.getUTCDate() + dir * 7);
+						newViewDate = new Date(focusDate);
+						newViewDate.setUTCDate(focusDate.getUTCDate() + dir * 7);
 					}
 					if (this.dateWithinRange(newDate)){
-						this.date = newDate;
-						this.viewDate = newViewDate;
+						this.focusDate = this.viewDate = newViewDate;
 						this.setValue();
-						this.update();
+						this.fill();
 						e.preventDefault();
-						dateChanged = true;
 					}
 					break;
+				case 32: // spacebar
+					// Spacebar is used in manually typing dates in some formats.
+					// As such, its behavior should not be hijacked.
+					break;
 				case 13: // enter
-					this.hide();
-					e.preventDefault();
+					focusDate = this.focusDate || this.dates.get(-1) || this.viewDate;
+					this._toggle_multidate(focusDate);
+					dateChanged = true;
+					this.focusDate = null;
+					this.viewDate = this.dates.get(-1) || this.viewDate;
+					this.setValue();
+					this.fill();
+					if (this.picker.is(':visible')){
+						e.preventDefault();
+						if (this.o.autoclose)
+							this.hide();
+					}
 					break;
 				case 9: // tab
+					this.focusDate = null;
+					this.viewDate = this.dates.get(-1) || this.viewDate;
+					this.fill();
 					this.hide();
 					break;
 			}
 			if (dateChanged){
-				this._trigger('changeDate');
+				if (this.dates.length)
+					this._trigger('changeDate');
+				else
+					this._trigger('clearDate');
 				var element;
 				if (this.isInput) {
 					element = this.element;
@@ -998,17 +1186,11 @@
 			if (dir) {
 				this.viewMode = Math.max(this.o.minViewMode, Math.min(2, this.viewMode + dir));
 			}
-			/*
-				vitalets: fixing bug of very special conditions:
-				jquery 1.7.1 + webkit + show inline datepicker in bootstrap popover.
-				Method show() does not set display css correctly and datepicker is not shown.
-				Changed to .css('display', 'block') solve the problem.
-				See https://github.com/vitalets/x-editable/issues/37
-
-				In jquery 1.7.2+ everything works fine.
-			*/
-			//this.picker.find('>div').hide().filter('.datepicker-'+DPGlobal.modes[this.viewMode].clsName).show();
-			this.picker.find('>div').hide().filter('.datepicker-'+DPGlobal.modes[this.viewMode].clsName).css('display', 'block');
+			this.picker
+				.find('>div')
+				.hide()
+				.filter('.datepicker-'+DPGlobal.modes[this.viewMode].clsName)
+					.css('display', 'block');
 			this.updateNavArrows();
 		}
 	};
@@ -1027,7 +1209,7 @@
 	};
 	DateRangePicker.prototype = {
 		updateDates: function(){
-			this.dates = $.map(this.pickers, function(i){ return i.date; });
+			this.dates = $.map(this.pickers, function(i){ return i.getUTCDate(); });
 			this.updateRanges();
 		},
 		updateRanges: function(){
@@ -1037,11 +1219,19 @@
 			});
 		},
 		dateUpdated: function(e){
+			// `this.updating` is a workaround for preventing infinite recursion
+			// between `changeDate` triggering and `setUTCDate` calling.  Until
+			// there is a better mechanism.
+			if (this.updating)
+				return;
+			this.updating = true;
+
 			var dp = $(e.target).data('datepicker'),
 				new_date = dp.getUTCDate(),
 				i = $.inArray(e.target, this.inputs),
 				l = this.inputs.length;
-			if (i == -1) return;
+			if (i === -1)
+				return;
 
 			$.each(this.pickers, function(i, p){
 				if (!p.getUTCDate())
@@ -1061,6 +1251,8 @@
 				}
 			}
 			this.updateDates();
+
+			delete this.updating;
 		},
 		remove: function(){
 			$.map(this.pickers, function(p){ p.remove(); });
@@ -1072,11 +1264,14 @@
 		// Derive options from element data-attrs
 		var data = $(el).data(),
 			out = {}, inkey,
-			replace = new RegExp('^' + prefix.toLowerCase() + '([A-Z])'),
-			prefix = new RegExp('^' + prefix.toLowerCase());
+			replace = new RegExp('^' + prefix.toLowerCase() + '([A-Z])');
+		prefix = new RegExp('^' + prefix.toLowerCase());
+		function re_lower(_,a){
+			return a.toLowerCase();
+		}
 		for (var key in data)
 			if (prefix.test(key)){
-				inkey = key.replace(replace, function(_,a){ return a.toLowerCase(); });
+				inkey = key.replace(replace, re_lower);
 				out[inkey] = data[key];
 			}
 		return out;
@@ -1108,7 +1303,7 @@
 		this.each(function () {
 			var $this = $(this),
 				data = $this.data('datepicker'),
-				options = typeof option == 'object' && option;
+				options = typeof option === 'object' && option;
 			if (!data) {
 				var elopts = opts_from_el(this, 'date'),
 					// Preliminary otions
@@ -1126,7 +1321,7 @@
 					$this.data('datepicker', (data = new Datepicker(this, opts)));
 				}
 			}
-			if (typeof option == 'string' && typeof data[option] == 'function') {
+			if (typeof option === 'string' && typeof data[option] === 'function') {
 				internal_return = data[option].apply(data, args);
 				if (internal_return !== undefined)
 					return false;
@@ -1150,6 +1345,8 @@
 		keyboardNavigation: true,
 		language: 'en',
 		minViewMode: 0,
+		multidate: false,
+		multidateSeparator: ',',
 		orientation: "auto",
 		rtl: false,
 		startDate: -Infinity,
@@ -1217,12 +1414,12 @@
 			if (date instanceof Date) return date;
 			if (typeof format === 'string')
 				format = DPGlobal.parseFormat(format);
+			var part_re = /([\-+]\d+)([dmwy])/,
+				parts = date.match(/([\-+]\d+)([dmwy])/g),
+				part, dir, i;
 			if (/^[\-+]\d+[dmwy]([\s,]+[\-+]\d+[dmwy])*$/.test(date)) {
-				var part_re = /([\-+]\d+)([dmwy])/,
-					parts = date.match(/([\-+]\d+)([dmwy])/g),
-					part, dir;
 				date = new Date();
-				for (var i=0; i<parts.length; i++) {
+				for (i=0; i<parts.length; i++) {
 					part = part_re.exec(parts[i]);
 					dir = parseInt(part[1]);
 					switch(part[2]){
@@ -1242,9 +1439,9 @@
 				}
 				return UTCDate(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), 0, 0, 0);
 			}
-			var parts = date && date.match(this.nonpunctuation) || [],
-				date = new Date(),
-				parsed = {},
+			parts = date && date.match(this.nonpunctuation) || [];
+			date = new Date();
+			var parsed = {},
 				setters_order = ['yyyy', 'yy', 'M', 'MM', 'm', 'mm', 'd', 'dd'],
 				setters_map = {
 					yyyy: function(d,v){ return d.setUTCFullYear(v); },
@@ -1256,51 +1453,50 @@
 						while (v<0) v += 12;
 						v %= 12;
 						d.setUTCMonth(v);
-						while (d.getUTCMonth() != v)
+						while (d.getUTCMonth() !== v)
 							d.setUTCDate(d.getUTCDate()-1);
 						return d;
 					},
 					d: function(d,v){ return d.setUTCDate(v); }
 				},
-				val, filtered, part;
+				val, filtered;
 			setters_map['M'] = setters_map['MM'] = setters_map['mm'] = setters_map['m'];
 			setters_map['dd'] = setters_map['d'];
 			date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
 			var fparts = format.parts.slice();
 			// Remove noop parts
-			if (parts.length != fparts.length) {
+			if (parts.length !== fparts.length) {
 				fparts = $(fparts).filter(function(i,p){
 					return $.inArray(p, setters_order) !== -1;
 				}).toArray();
 			}
 			// Process remainder
-			if (parts.length == fparts.length) {
-				for (var i=0, cnt = fparts.length; i < cnt; i++) {
+			function match_part(){
+				var m = this.slice(0, parts[i].length),
+					p = parts[i].slice(0, m.length);
+				return m === p;
+			}
+			if (parts.length === fparts.length) {
+				var cnt;
+				for (i=0, cnt = fparts.length; i < cnt; i++) {
 					val = parseInt(parts[i], 10);
 					part = fparts[i];
 					if (isNaN(val)) {
 						switch(part) {
 							case 'MM':
-								filtered = $(dates[language].months).filter(function(){
-									var m = this.slice(0, parts[i].length),
-										p = parts[i].slice(0, m.length);
-									return m == p;
-								});
+								filtered = $(dates[language].months).filter(match_part);
 								val = $.inArray(filtered[0], dates[language].months) + 1;
 								break;
 							case 'M':
-								filtered = $(dates[language].monthsShort).filter(function(){
-									var m = this.slice(0, parts[i].length),
-										p = parts[i].slice(0, m.length);
-									return m == p;
-								});
+								filtered = $(dates[language].monthsShort).filter(match_part);
 								val = $.inArray(filtered[0], dates[language].monthsShort) + 1;
 								break;
 						}
 					}
 					parsed[part] = val;
 				}
-				for (var i=0, _date, s; i<setters_order.length; i++){
+				var _date, s;
+				for (i=0; i<setters_order.length; i++){
 					s = setters_order[i];
 					if (s in parsed && !isNaN(parsed[s])){
 						_date = new Date(date);
@@ -1329,8 +1525,8 @@
 			};
 			val.dd = (val.d < 10 ? '0' : '') + val.d;
 			val.mm = (val.m < 10 ? '0' : '') + val.m;
-			var date = [],
-				seps = $.extend([], format.separators);
+			date = [];
+			var seps = $.extend([], format.separators);
 			for (var i=0, cnt = format.parts.length; i <= cnt; i++) {
 				if (seps.length)
 					date.push(seps.shift());
@@ -1346,7 +1542,14 @@
 							'</tr>'+
 						'</thead>',
 		contTemplate: '<tbody><tr><td colspan="7"></td></tr></tbody>',
-		footTemplate: '<tfoot><tr><th colspan="7" class="today"></th></tr><tr><th colspan="7" class="clear"></th></tr></tfoot>'
+		footTemplate: '<tfoot>'+
+							'<tr>'+
+								'<th colspan="7" class="today"></th>'+
+							'</tr>'+
+							'<tr>'+
+								'<th colspan="7" class="clear"></th>'+
+							'</tr>'+
+						'</tfoot>'
 	};
 	DPGlobal.template = '<div class="datepicker">'+
 							'<div class="datepicker-days">'+

data/vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.it.js

@@ -10,6 +10,7 @@
 		months: ["Gennaio", "Febbraio", "Marzo", "Aprile", "Maggio", "Giugno", "Luglio", "Agosto", "Settembre", "Ottobre", "Novembre", "Dicembre"],
 		monthsShort: ["Gen", "Feb", "Mar", "Apr", "Mag", "Giu", "Lug", "Ago", "Set", "Ott", "Nov", "Dic"],
 		today: "Oggi",
+		clear: "Cancella",
 		weekStart: 1,
 		format: "dd/mm/yyyy"
 	};

data/vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.lv.js

@@ -7,10 +7,10 @@
     $.fn.datepicker.dates['lv'] = {
         days: ["Svētdiena", "Pirmdiena", "Otrdiena", "Trešdiena", "Ceturtdiena", "Piektdiena", "Sestdiena", "Svētdiena"],
         daysShort: ["Sv", "P", "O", "T", "C", "Pk", "S", "Sv"],
-        daysMin: ["Sv", "Pr", "Ot", "Tr", "Ce", "Pk", "St", "Sv"],
+        daysMin: ["Sv", "Pr", "Ot", "Tr", "Ce", "Pk", "Se", "Sv"],
         months: ["Janvāris", "Februāris", "Marts", "Aprīlis", "Maijs", "Jūnijs", "Jūlijs", "Augusts", "Septembris", "Oktobris", "Novembris", "Decembris"],
-        monthsShort: ["Jan", "Feb", "Mar", "Apr", "Mai", "Jūn", "Jūl", "Aug", "Sep", "Okt", "Nov", "Dec."],
+        monthsShort: ["Jan", "Feb", "Mar", "Apr", "Mai", "Jūn", "Jūl", "Aug", "Sep", "Okt", "Nov", "Dec"],
         today: "Šodien",
         weekStart: 1
     };
-}(jQuery));
+}(jQuery));

data/vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.ua.js

@@ -4,11 +4,11 @@
  */
 ;(function($){
 	$.fn.datepicker.dates['ua'] = {
-		days: ["Неділя", "Понеділок", "Вівторок", "Середа", "Четверг", "П'ятница", "Субота", "Неділя"],
+		days: ["Неділя", "Понеділок", "Вівторок", "Середа", "Четвер", "П'ятница", "Субота", "Неділя"],
 		daysShort: ["Нед", "Пнд", "Втр", "Срд", "Чтв", "Птн", "Суб", "Нед"],
 		daysMin: ["Нд", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб", "Нд"],
 		months: ["Cічень", "Лютий", "Березень", "Квітень", "Травень", "Червень", "Липень", "Серпень", "Вересень", "Жовтень", "Листопад", "Грудень"],
-		monthsShort: ["Січ", "Лют", "Бер", "Квт", "Трв", "Чер", "Лип", "Сер", "Вер", "Жов", "Лис", "Грд"],
+		monthsShort: ["Січ", "Лют", "Бер", "Кві", "Тра", "Чер", "Лип", "Сер", "Вер", "Жов", "Лис", "Гру"],
 		today: "Сьогодні",
 		weekStart: 1
 	};

data/vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.vi.js

@@ -0,0 +1,16 @@
+/**
+ * Vietnamese translation for bootstrap-datepicker
+ * An Vo <https://github.com/anvoz/>
+ */
+;(function($){
+	$.fn.datepicker.dates['vi'] = {
+		days: ["Chủ nhật", "Thứ hai", "Thứ ba", "Thứ tư", "Thứ năm", "Thứ sáu", "Thứ bảy", "Chủ nhật"],
+		daysShort: ["CN", "Thứ 2", "Thứ 3", "Thứ 4", "Thứ 5", "Thứ 6", "Thứ 7", "CN"],
+		daysMin: ["CN", "T2", "T3", "T4", "T5", "T6", "T7", "CN"],
+		months: ["Tháng 1", "Tháng 2", "Tháng 3", "Tháng 4", "Tháng 5", "Tháng 6", "Tháng 7", "Tháng 8", "Tháng 9", "Tháng 10", "Tháng 11", "Tháng 12"],
+		monthsShort: ["Th1", "Th2", "Th3", "Th4", "Th5", "Th6", "Th7", "Th8", "Th9", "Th10", "Th11", "Th12"],
+		today: "Hôm nay",
+		clear: "Xóa",
+		format: "dd/mm/yyyy"
+	};
+}(jQuery));

data/vendor/assets/stylesheets/bootstrap-datepicker.css

@@ -16,7 +16,6 @@
   /*.dow {
 		border-top: 1px solid #ddd !important;
 	}*/
-
 }
 .datepicker-inline {
   width: 220px;
@@ -113,7 +112,8 @@
 .table-striped .datepicker table tr th {
   background-color: transparent;
 }
-.datepicker table tr td.day:hover {
+.datepicker table tr td.day:hover,
+.datepicker table tr td.day.focused {
   background: #eeeeee;
   cursor: pointer;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-datepicker-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.1.10
+  version: 1.1.1.11
 platform: ruby
 authors:
 - Gonzalo Rodríguez-Baltanás Díaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -101,7 +101,6 @@ files:
 - vendor/assets/javascripts/bootstrap-datepicker/index.js
 - vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.ar.js
 - vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.bg.js
-- vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.br.js
 - vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.ca.js
 - vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.cs.js
 - vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.cy.js
@@ -148,6 +147,7 @@ files:
 - vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.tr.js
 - vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.ua.js
 - vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.uk.js
+- vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.vi.js
 - vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.zh-CN.js
 - vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.zh-TW.js
 - vendor/assets/stylesheets/bootstrap-datepicker.css

data/vendor/assets/javascripts/bootstrap-datepicker/locales/bootstrap-datepicker.br.js

@@ -1,13 +0,0 @@
-/**
- * Brazilian translation for bootstrap-datepicker
- * Cauan Cabral <cauan@radig.com.br>
- */
-;(function($){
-	$.fn.datepicker.dates['br'] = {
-		days: ["Domingo", "Segunda", "Terça", "Quarta", "Quinta", "Sexta", "Sábado", "Domingo"],
-		daysShort: ["Dom", "Seg", "Ter", "Qua", "Qui", "Sex", "Sáb", "Dom"],
-		daysMin: ["Do", "Se", "Te", "Qu", "Qu", "Se", "Sa", "Do"],
-		months: ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"],
-		monthsShort: ["Jan", "Fev", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Out", "Nov", "Dez"]
-	};
-}(jQuery));