app/assets/javascripts/bootstrap/bootstrap-datepicker.js in bootstrap-rails-engine-3.0.3.0 vs app/assets/javascripts/bootstrap/bootstrap-datepicker.js in bootstrap-rails-engine-3.1.1.0
- old
+ new
@@ -1,11 +1,13 @@
/* =========================================================
* bootstrap-datepicker.js
- * http://www.eyecon.ro/bootstrap-datepicker
+ * Repo: https://github.com/eternicode/bootstrap-datepicker/
+ * Demo: http://eternicode.github.io/bootstrap-datepicker/
+ * Docs: http://bootstrap-datepicker.readthedocs.org/
+ * Forked from http://www.eyecon.ro/bootstrap-datepicker
* =========================================================
- * Copyright 2012 Stefan Petre
- * Improvements by Andrew Rowls
+ * Started by Stefan Petre; improvements by Andrew Rowls + contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
@@ -16,55 +18,103 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================= */
-(function( $ ) {
+(function($, undefined){
var $window = $(window);
function UTCDate(){
return new Date(Date.UTC.apply(Date, arguments));
}
function UTCToday(){
var today = new Date();
- return UTCDate(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate());
+ 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) {
- var that = this;
+ var Datepicker = function(element, options){
+ this.dates = new DateArray();
+ this.viewDate = UTCToday();
+ this.focusDate = null;
this._process_options(options);
this.element = $(element);
this.isInline = false;
this.isInput = this.element.is('input');
- this.component = this.element.is('.date') ? this.element.find('.add-on, .btn') : false;
+ this.component = this.element.is('.date') ? this.element.find('.add-on, .input-group-addon, .btn') : false;
this.hasInput = this.component && this.element.find('input').length;
- if(this.component && this.component.length === 0)
+ if (this.component && this.component.length === 0)
this.component = false;
this.picker = $(DPGlobal.template);
this._buildEvents();
this._attachEvents();
- if(this.isInline) {
+ if (this.isInline){
this.picker.addClass('datepicker-inline').appendTo(this.element);
- } else {
+ }
+ else {
this.picker.addClass('datepicker-dropdown dropdown-menu');
}
if (this.o.rtl){
this.picker.addClass('datepicker-rtl');
- this.picker.find('.prev i, .next i')
- .toggleClass('icon-arrow-left icon-arrow-right');
}
-
this.viewMode = this.o.startView;
if (this.o.calendarWeeks)
this.picker.find('tfoot th.today')
.attr('colspan', function(i, val){
@@ -83,11 +133,11 @@
this._allow_update = true;
this.update();
this.showMode();
- if(this.isInline) {
+ if (this.isInline){
this.show();
}
};
Datepicker.prototype = {
@@ -100,18 +150,18 @@
var o = this.o = $.extend({}, this._o);
// Check if "de-DE" style date is available, if not language should
// fallback to 2 letter code eg "de"
var lang = o.language;
- if (!dates[lang]) {
+ if (!dates[lang]){
lang = lang.split('-')[0];
if (!dates[lang])
lang = defaults.language;
}
o.language = lang;
- switch(o.startView){
+ switch (o.startView){
case 2:
case 'decade':
o.startView = 2;
break;
case 1:
@@ -120,11 +170,11 @@
break;
default:
o.startView = 0;
}
- switch (o.minViewMode) {
+ switch (o.minViewMode){
case 1:
case 'months':
o.minViewMode = 1;
break;
case 2:
@@ -135,39 +185,51 @@
o.minViewMode = 0;
}
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);
var format = DPGlobal.parseFormat(o.format);
- if (o.startDate !== -Infinity) {
- if (!!o.startDate) {
+ if (o.startDate !== -Infinity){
+ if (!!o.startDate){
if (o.startDate instanceof Date)
o.startDate = this._local_to_utc(this._zero_time(o.startDate));
else
o.startDate = DPGlobal.parseDate(o.startDate, format, o.language);
- } else {
+ }
+ else {
o.startDate = -Infinity;
}
}
- if (o.endDate !== Infinity) {
- if (!!o.endDate) {
+ if (o.endDate !== Infinity){
+ if (!!o.endDate){
if (o.endDate instanceof Date)
o.endDate = this._local_to_utc(this._zero_time(o.endDate));
else
o.endDate = DPGlobal.parseDate(o.endDate, format, o.language);
- } else {
+ }
+ else {
o.endDate = Infinity;
}
}
o.daysOfWeekDisabled = o.daysOfWeekDisabled||[];
if (!$.isArray(o.daysOfWeekDisabled))
o.daysOfWeekDisabled = o.daysOfWeekDisabled.split(/[,\s]*/);
- o.daysOfWeekDisabled = $.map(o.daysOfWeekDisabled, function (d) {
+ o.daysOfWeekDisabled = $.map(o.daysOfWeekDisabled, function(d){
return parseInt(d, 10);
});
var plc = String(o.orientation).toLowerCase().split(/\s+/g),
_plc = o.orientation.toLowerCase();
@@ -176,11 +238,11 @@
});
o.orientation = {x: 'auto', y: 'auto'};
if (!_plc || _plc === 'auto')
; // no action
else if (plc.length === 1){
- switch(plc[0]){
+ switch (plc[0]){
case 'top':
case 'bottom':
o.orientation.y = plc[0];
break;
case 'left':
@@ -202,73 +264,107 @@
}
},
_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(){
- if (this.isInput) { // single input
+ if (this.isInput){ // single input
this._events = [
[this.element, {
focus: $.proxy(this.show, this),
- keyup: $.proxy(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)
}]
];
}
else if (this.component && this.hasInput){ // component: input + button
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),
+ 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, {
click: $.proxy(this.show, this)
}]
];
}
- else if (this.element.is('div')) { // inline datepicker
+ else if (this.element.is('div')){ // inline datepicker
this.isInline = true;
}
else {
this._events = [
[this.element, {
click: $.proxy(this.show, this)
}]
];
}
+ 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, {
click: $.proxy(this.click, this)
}],
[$(window), {
resize: $.proxy(this.place, this)
}],
[$(document), {
- mousedown: $.proxy(function (e) {
+ 'mousedown touchstart': $.proxy(function(e){
// Clicked outside the datepicker, hide it
if (!(
this.element.is(e.target) ||
this.element.find(e.target).length ||
this.picker.is(e.target) ||
this.picker.find(e.target).length
- )) {
+ )){
this.hide();
}
}, this)
}]
];
@@ -286,39 +382,48 @@
},
_detachSecondaryEvents: function(){
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(e){
- if(this.isInline) return;
- if (!this.picker.is(':visible')) return;
+ 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;
this.showMode();
@@ -331,66 +436,89 @@
)
this.setValue();
this._trigger('hide');
},
- remove: function() {
+ remove: function(){
this.hide();
this._detachEvents();
this._detachSecondaryEvents();
this.picker.remove();
delete this.element.data().datepicker;
- if (!this.isInput) {
+ if (!this.isInput){
delete this.element.data().date;
}
},
_utc_to_local: function(utc){
- return new Date(utc.getTime() + (utc.getTimezoneOffset()*60000));
+ return utc && new Date(utc.getTime() + (utc.getTimezoneOffset()*60000));
},
_local_to_utc: function(local){
- return new Date(local.getTime() - (local.getTimezoneOffset()*60000));
+ return local && new Date(local.getTime() - (local.getTimezoneOffset()*60000));
},
_zero_time: function(local){
- return new Date(local.getFullYear(), local.getMonth(), local.getDate());
+ return local && new Date(local.getFullYear(), local.getMonth(), local.getDate());
},
_zero_utc_time: function(utc){
- return new Date(Date.UTC(utc.getUTCFullYear(), utc.getUTCMonth(), utc.getUTCDate()));
+ return utc && new Date(Date.UTC(utc.getUTCFullYear(), utc.getUTCMonth(), utc.getUTCDate()));
},
- getDate: function() {
+ 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;
+ getUTCDate: function(){
+ return new Date(this.dates.get(-1));
},
- setDate: function(d) {
- this.setUTCDate(this._local_to_utc(d));
+ setDates: function(){
+ var args = $.isArray(arguments[0]) ? arguments[0] : arguments;
+ this.update.apply(this, args);
+ this._trigger('changeDate');
+ this.setValue();
},
- setUTCDate: function(d) {
- this.date = d;
+ setUTCDates: function(){
+ var args = $.isArray(arguments[0]) ? arguments[0] : arguments;
+ this.update.apply(this, $.map(args, this._utc_to_local));
+ this._trigger('changeDate');
this.setValue();
},
- setValue: function() {
+ setDate: alias('setDates'),
+ setUTCDate: alias('setUTCDates'),
+
+ setValue: function(){
var formatted = this.getFormattedDate();
- if (!this.isInput) {
+ if (!this.isInput){
if (this.component){
this.element.find('input').val(formatted).change();
}
- } else {
+ }
+ else {
this.element.val(formatted).change();
}
},
- getFormattedDate: function(format) {
+ 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){
this._process_options({startDate: startDate});
this.update();
@@ -408,21 +536,22 @@
this.update();
this.updateNavArrows();
},
place: function(){
- if(this.isInline) return;
+ if (this.isInline)
+ return;
var calendarWidth = this.picker.outerWidth(),
calendarHeight = this.picker.outerHeight(),
visualPadding = 10,
windowWidth = $window.width(),
windowHeight = $window.height(),
scrollTop = $window.scrollTop();
- var zIndex = parseInt(this.element.parents().filter(function() {
- return $(this).css('z-index') != 'auto';
- }).first().css('z-index'))+10;
+ var zIndex = parseInt(this.element.parents().filter(function(){
+ 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);
var width = this.component ? this.component.outerWidth(true) : this.element.outerWidth(false);
var left = offset.left,
top = offset.top;
@@ -430,11 +559,11 @@
this.picker.removeClass(
'datepicker-orient-top datepicker-orient-bottom '+
'datepicker-orient-right datepicker-orient-left'
);
- if (this.o.orientation.x !== 'auto') {
+ if (this.o.orientation.x !== 'auto'){
this.picker.addClass('datepicker-orient-' + this.o.orientation.x);
if (this.o.orientation.x === 'right')
left -= calendarWidth - width;
}
// auto x orientation is best-placement: if it crosses a window
@@ -450,11 +579,11 @@
// auto y orientation is best-situation: top or bottom, no fudging,
// decision based on which shows more of the calendar
var yorient = this.o.orientation.y,
top_overflow, bottom_overflow;
- if (yorient === 'auto') {
+ if (yorient === 'auto'){
top_overflow = -scrollTop + offset.top - calendarHeight;
bottom_overflow = scrollTop + windowHeight - (offset.top + height + calendarHeight);
if (Math.max(top_overflow, bottom_overflow) === bottom_overflow)
yorient = 'top';
else
@@ -473,161 +602,183 @@
});
},
_allow_update: true,
update: function(){
- if (!this._allow_update) return;
+ if (!this._allow_update)
+ return;
- var oldDate = new Date(this.date),
- date, fromArgs = false;
- if(arguments && arguments.length && (typeof arguments[0] === 'string' || arguments[0] instanceof Date)) {
- date = arguments[0];
- if (date instanceof Date)
- date = this._local_to_utc(date);
+ var oldDates = this.dates.copy(),
+ dates = [],
+ fromArgs = false;
+ if (arguments.length){
+ $.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();
+ }
+ else {
+ 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);
+ 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 (fromArgs) {
+ 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);
+ else if (this.viewDate > this.o.endDate)
+ this.viewDate = new Date(this.o.endDate);
+
+ if (fromArgs){
// setting date by clicking
this.setValue();
- } else if (date) {
+ }
+ else if (dates.length){
// setting date by typing
- if (oldDate.getTime() !== this.date.getTime())
+ if (String(oldDates) !== String(this.dates))
this._trigger('changeDate');
- } else {
- // clearing date
- this._trigger('clearDate');
}
+ if (!this.dates.length && oldDates.length)
+ this._trigger('clearDate');
- if (this.date < this.o.startDate) {
- this.viewDate = new Date(this.o.startDate);
- this.date = new Date(this.o.startDate);
- } else if (this.date > this.o.endDate) {
- this.viewDate = new Date(this.o.endDate);
- this.date = new Date(this.o.endDate);
- } else {
- this.viewDate = new Date(this.date);
- this.date = new Date(this.date);
- }
this.fill();
},
fillDow: function(){
var dowCnt = this.o.weekStart,
- html = '<tr>';
- if(this.o.calendarWeeks){
+ html = '<tr>';
+ if (this.o.calendarWeeks){
var cell = '<th class="cw"> </th>';
html += cell;
this.picker.find('.datepicker-days thead tr:first-child').prepend(cell);
}
- while (dowCnt < this.o.weekStart + 7) {
+ while (dowCnt < this.o.weekStart + 7){
html += '<th class="dow">'+dates[this.o.language].daysMin[(dowCnt++)%7]+'</th>';
}
html += '</tr>';
this.picker.find('.datepicker-days thead').append(html);
},
fillMonths: function(){
var html = '',
i = 0;
- while (i < 12) {
+ while (i < 12){
html += '<span class="month">'+dates[this.o.language].monthsShort[i++]+'</span>';
}
this.picker.find('.datepicker-months td').html(html);
},
setRange: function(range){
if (!range || !range.length)
delete this.range;
else
- this.range = $.map(range, function(d){ return d.valueOf(); });
+ this.range = $.map(range, function(d){
+ return d.valueOf();
+ });
this.fill();
},
getClassNames: function(date){
var cls = [],
year = this.viewDate.getUTCFullYear(),
month = this.viewDate.getUTCMonth(),
- currentDate = 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 (currentDate && 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) {
+ $.inArray(date.getUTCDay(), this.o.daysOfWeekDisabled) !== -1){
cls.push('disabled');
}
if (this.range){
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');
}
}
return cls;
},
- fill: function() {
+ fill: function(){
var d = new Date(this.viewDate),
year = d.getUTCFullYear(),
month = d.getUTCMonth(),
startYear = this.o.startDate !== -Infinity ? this.o.startDate.getUTCFullYear() : -Infinity,
startMonth = this.o.startDate !== -Infinity ? this.o.startDate.getUTCMonth() : -Infinity,
endYear = this.o.endDate !== Infinity ? this.o.endDate.getUTCFullYear() : Infinity,
endMonth = this.o.endDate !== Infinity ? this.o.endDate.getUTCMonth() : Infinity,
- currentDate = this.date && this.date.valueOf(),
+ todaytxt = dates[this.o.language].today || dates['en'].today || '',
+ cleartxt = dates[this.o.language].clear || dates['en'].clear || '',
tooltip;
this.picker.find('.datepicker-days thead th.datepicker-switch')
.text(dates[this.o.language].months[month]+' '+year);
this.picker.find('tfoot th.today')
- .text(dates[this.o.language].today)
+ .text(todaytxt)
.toggle(this.o.todayBtn !== false);
this.picker.find('tfoot th.clear')
- .text(dates[this.o.language].clear)
+ .text(cleartxt)
.toggle(this.o.clearBtn !== false);
this.updateNavArrows();
this.fillMonths();
- var prevMonth = UTCDate(year, month-1, 28,0,0,0,0),
+ var prevMonth = UTCDate(year, month-1, 28),
day = DPGlobal.getDaysInMonth(prevMonth.getUTCFullYear(), prevMonth.getUTCMonth());
prevMonth.setUTCDate(day);
prevMonth.setUTCDate(day - (prevMonth.getUTCDay() - this.o.weekStart + 7)%7);
var nextMonth = new Date(prevMonth);
nextMonth.setUTCDate(nextMonth.getUTCDate() + 42);
nextMonth = nextMonth.valueOf();
var html = [];
var clsName;
- while(prevMonth.valueOf() < nextMonth) {
- if (prevMonth.getUTCDay() == this.o.weekStart) {
+ while (prevMonth.valueOf() < nextMonth){
+ if (prevMonth.getUTCDay() === this.o.weekStart){
html.push('<tr>');
- if(this.o.calendarWeeks){
+ if (this.o.calendarWeeks){
// ISO 8601: First week contains first thursday.
// ISO also states week starts on Monday, but we can be more abstract here.
var
// Start of current week: based on weekstart/current date
ws = new Date(+prevMonth + (this.o.weekStart - prevMonth.getUTCDay() - 7) % 7 * 864e5),
// Thursday of this week
- th = new Date(+ws + (7 + 4 - ws.getUTCDay()) % 7 * 864e5),
+ th = new Date(Number(ws) + (7 + 4 - ws.getUTCDay()) % 7 * 864e5),
// First Thursday of year, year from thursday
- yth = new Date(+(yth = UTCDate(th.getUTCFullYear(), 0, 1)) + (7 + 4 - yth.getUTCDay())%7*864e5),
+ yth = new Date(Number(yth = UTCDate(th.getUTCFullYear(), 0, 1)) + (7 + 4 - yth.getUTCDay())%7*864e5),
// Calendar week: ms between thursdays, div ms per day, div 7 days
calWeek = (th - yth) / 864e5 / 7 + 1;
html.push('<td class="cw">'+ calWeek +'</td>');
}
@@ -651,33 +802,35 @@
tooltip = before.tooltip;
}
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.getUTCMonth()).addClass('active');
- }
- if (year < startYear || year > endYear) {
+
+ $.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');
}
html = '';
year = parseInt(year/10, 10) * 10;
@@ -685,66 +838,85 @@
.find('th:eq(1)')
.text(year + '-' + (year + 9))
.end()
.find('td');
year -= 1;
- 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>';
+ var years = $.map(this.dates, function(d){
+ return d.getUTCFullYear();
+ }),
+ classes;
+ for (var i = -1; i < 11; i++){
+ 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);
},
- updateNavArrows: function() {
- if (!this._allow_update) return;
+ updateNavArrows: function(){
+ if (!this._allow_update)
+ return;
var d = new Date(this.viewDate),
year = d.getUTCFullYear(),
month = d.getUTCMonth();
- switch (this.viewMode) {
+ switch (this.viewMode){
case 0:
- if (this.o.startDate !== -Infinity && year <= this.o.startDate.getUTCFullYear() && month <= this.o.startDate.getUTCMonth()) {
+ if (this.o.startDate !== -Infinity && year <= this.o.startDate.getUTCFullYear() && month <= this.o.startDate.getUTCMonth()){
this.picker.find('.prev').css({visibility: 'hidden'});
- } else {
+ }
+ else {
this.picker.find('.prev').css({visibility: 'visible'});
}
- if (this.o.endDate !== Infinity && year >= this.o.endDate.getUTCFullYear() && month >= this.o.endDate.getUTCMonth()) {
+ if (this.o.endDate !== Infinity && year >= this.o.endDate.getUTCFullYear() && month >= this.o.endDate.getUTCMonth()){
this.picker.find('.next').css({visibility: 'hidden'});
- } else {
+ }
+ else {
this.picker.find('.next').css({visibility: 'visible'});
}
break;
case 1:
case 2:
- if (this.o.startDate !== -Infinity && year <= this.o.startDate.getUTCFullYear()) {
+ if (this.o.startDate !== -Infinity && year <= this.o.startDate.getUTCFullYear()){
this.picker.find('.prev').css({visibility: 'hidden'});
- } else {
+ }
+ else {
this.picker.find('.prev').css({visibility: 'visible'});
}
- if (this.o.endDate !== Infinity && year >= this.o.endDate.getUTCFullYear()) {
+ if (this.o.endDate !== Infinity && year >= this.o.endDate.getUTCFullYear()){
this.picker.find('.next').css({visibility: 'hidden'});
- } else {
+ }
+ else {
this.picker.find('.next').css({visibility: 'visible'});
}
break;
}
},
- click: function(e) {
+ click: function(e){
e.preventDefault();
- var target = $(e.target).closest('span, td, th');
- if (target.length == 1) {
- switch(target[0].nodeName.toLowerCase()) {
+ var target = $(e.target).closest('span, td, th'),
+ year, month, day;
+ if (target.length === 1){
+ switch (target[0].nodeName.toLowerCase()){
case 'th':
- switch(target[0].className) {
+ switch (target[0].className){
case 'datepicker-switch':
this.showMode(1);
break;
case 'prev':
case 'next':
- var dir = DPGlobal.modes[this.viewMode].navStep * (target[0].className == 'prev' ? -1 : 1);
- switch(this.viewMode){
+ 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);
this._trigger('changeMonth', this.viewDate);
break;
case 1:
@@ -759,133 +931,169 @@
case 'today':
var date = new Date();
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':
var element;
if (this.isInput)
element = this.element;
else if (this.component)
element = this.element.find('input');
if (element)
element.val("").change();
- this._trigger('changeDate');
this.update();
+ this._trigger('changeDate');
if (this.o.autoclose)
this.hide();
break;
}
break;
case 'span':
- if (!target.is('.disabled')) {
+ if (!target.is('.disabled')){
this.viewDate.setUTCDate(1);
- if (target.is('.month')) {
- var day = 1;
- var month = target.parent().find('span').index(target);
- var year = this.viewDate.getUTCFullYear();
+ if (target.is('.month')){
+ day = 1;
+ month = target.parent().find('span').index(target);
+ year = this.viewDate.getUTCFullYear();
this.viewDate.setUTCMonth(month);
this._trigger('changeMonth', this.viewDate);
- if (this.o.minViewMode === 1) {
- this._setDate(UTCDate(year, month, day,0,0,0,0));
+ if (this.o.minViewMode === 1){
+ this._setDate(UTCDate(year, month, day));
}
- } else {
- var year = parseInt(target.text(), 10)||0;
- var day = 1;
- var month = 0;
+ }
+ else {
+ day = 1;
+ month = 0;
+ year = parseInt(target.text(), 10)||0;
this.viewDate.setUTCFullYear(year);
this._trigger('changeYear', this.viewDate);
- if (this.o.minViewMode === 2) {
- this._setDate(UTCDate(year, month, day,0,0,0,0));
+ if (this.o.minViewMode === 2){
+ this._setDate(UTCDate(year, month, day));
}
}
this.showMode(-1);
this.fill();
}
break;
case 'td':
if (target.is('.day') && !target.is('.disabled')){
- var day = parseInt(target.text(), 10)||1;
- var year = this.viewDate.getUTCFullYear(),
- month = this.viewDate.getUTCMonth();
- if (target.is('.old')) {
- if (month === 0) {
+ day = parseInt(target.text(), 10)||1;
+ year = this.viewDate.getUTCFullYear();
+ month = this.viewDate.getUTCMonth();
+ if (target.is('.old')){
+ if (month === 0){
month = 11;
year -= 1;
- } else {
+ }
+ else {
month -= 1;
}
- } else if (target.is('.new')) {
- if (month == 11) {
+ }
+ else if (target.is('.new')){
+ if (month === 11){
month = 0;
year += 1;
- } else {
+ }
+ else {
month += 1;
}
}
- this._setDate(UTCDate(year, month, day,0,0,0,0));
+ this._setDate(UTCDate(year, month, day));
}
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 = new Date(date);
- if (!which || which == 'view')
- this.viewDate = new Date(date);
+ 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');
var element;
- if (this.isInput) {
+ if (this.isInput){
element = this.element;
- } else if (this.component){
+ }
+ else if (this.component){
element = this.element.find('input');
}
- if (element) {
+ if (element){
element.change();
}
- if (this.o.autoclose && (!which || which == 'date')) {
+ if (this.o.autoclose && (!which || which === 'date')){
this.hide();
}
},
moveMonth: function(date, dir){
- if (!dir) return date;
+ if (!date)
+ return undefined;
+ if (!dir)
+ return date;
var new_date = new Date(date.valueOf()),
day = new_date.getUTCDate(),
month = new_date.getUTCMonth(),
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
if (new_month < 0 || new_month > 11)
new_month = (new_month + 12) % 12;
- } else {
+ }
+ else {
// For magnitudes >1, move one month at a time...
- for (var i=0; i<mag; i++)
+ for (var i=0; i < mag; i++)
// ...which might decrease the day (eg, Jan 31 to Feb 28, etc)...
new_date = this.moveMonth(new_date, dir);
// ...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
while (test()){
new_date.setUTCDate(--day);
@@ -902,160 +1110,206 @@
return date >= this.o.startDate && date <= this.o.endDate;
},
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, day, month,
- newDate, newViewDate;
- switch(e.keyCode){
+ 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;
+ if (!this.o.keyboardNavigation)
+ break;
+ dir = e.keyCode === 37 ? -1 : 1;
if (e.ctrlKey){
- newDate = this.moveYear(this.date, 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, dir);
- newViewDate = this.moveMonth(this.viewDate, dir);
+ }
+ else if (e.shiftKey){
+ 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);
- newDate.setUTCDate(this.date.getUTCDate() + dir);
- newViewDate = new Date(this.viewDate);
- newViewDate.setUTCDate(this.viewDate.getUTCDate() + dir);
}
+ else {
+ newDate = new Date(this.dates.get(-1) || UTCToday());
+ newDate.setUTCDate(newDate.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;
+ if (!this.o.keyboardNavigation)
+ break;
+ dir = e.keyCode === 38 ? -1 : 1;
if (e.ctrlKey){
- newDate = this.moveYear(this.date, 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, dir);
- newViewDate = this.moveMonth(this.viewDate, dir);
+ }
+ else if (e.shiftKey){
+ 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);
- newDate.setUTCDate(this.date.getUTCDate() + dir * 7);
- newViewDate = new Date(this.viewDate);
- newViewDate.setUTCDate(this.viewDate.getUTCDate() + dir * 7);
}
+ else {
+ 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) {
+ if (this.isInput){
element = this.element;
- } else if (this.component){
+ }
+ else if (this.component){
element = this.element.find('input');
}
- if (element) {
+ if (element){
element.change();
}
}
},
- showMode: function(dir) {
- if (dir) {
+ showMode: function(dir){
+ 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();
}
};
var DateRangePicker = function(element, options){
this.element = $(element);
- this.inputs = $.map(options.inputs, function(i){ return i.jquery ? i[0] : i; });
+ this.inputs = $.map(options.inputs, function(i){
+ return i.jquery ? i[0] : i;
+ });
delete options.inputs;
$(this.inputs)
.datepicker(options)
.bind('changeDate', $.proxy(this.dateUpdated, this));
- this.pickers = $.map(this.inputs, function(i){ return $(i).data('datepicker'); });
+ this.pickers = $.map(this.inputs, function(i){
+ return $(i).data('datepicker');
+ });
this.updateDates();
};
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(){
- var range = $.map(this.dates, function(d){ return d.valueOf(); });
+ var range = $.map(this.dates, function(d){
+ return d.valueOf();
+ });
$.each(this.pickers, function(i, p){
p.setRange(range);
});
},
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())
+ p.setUTCDate(new_date);
+ });
+
if (new_date < this.dates[i]){
// Date being moved earlier/left
- while (i>=0 && new_date < this.dates[i]){
+ while (i >= 0 && new_date < this.dates[i]){
this.pickers[i--].setUTCDate(new_date);
}
}
else if (new_date > this.dates[i]){
// Date being moved later/right
- while (i<l && new_date > this.dates[i]){
+ while (i < l && new_date > this.dates[i]){
this.pickers[i++].setUTCDate(new_date);
}
}
this.updateDates();
+
+ delete this.updating;
},
remove: function(){
$.map(this.pickers, function(p){ p.remove(); });
delete this.element.data().datepicker;
}
@@ -1063,27 +1317,30 @@
function opts_from_el(el, prefix){
// 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;
}
function opts_from_locale(lang){
// Derive options from locale plugins
var out = {};
// Check if "de-DE" style date is available, if not language should
// fallback to 2 letter code eg "de"
- if (!dates[lang]) {
- lang = lang.split('-')[0]
+ if (!dates[lang]){
+ lang = lang.split('-')[0];
if (!dates[lang])
return;
}
var d = dates[lang];
$.each(locale_opts, function(i,k){
@@ -1092,20 +1349,19 @@
});
return out;
}
var old = $.fn.datepicker;
- $.fn.datepicker = function ( option ) {
+ $.fn.datepicker = function(option){
var args = Array.apply(null, arguments);
args.shift();
- var internal_return,
- this_return;
- this.each(function () {
+ var internal_return;
+ this.each(function(){
var $this = $(this),
data = $this.data('datepicker'),
- options = typeof option == 'object' && option;
- if (!data) {
+ options = typeof option === 'object' && option;
+ if (!data){
var elopts = opts_from_el(this, 'date'),
// Preliminary otions
xopts = $.extend({}, defaults, elopts, options),
locopts = opts_from_locale(xopts.language),
// Options priority: js args, data-attrs, locales, defaults
@@ -1114,15 +1370,15 @@
var ropts = {
inputs: opts.inputs || $this.find('input').toArray()
};
$this.data('datepicker', (data = new DateRangePicker(this, $.extend(opts, ropts))));
}
- else{
+ else {
$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;
}
});
@@ -1142,10 +1398,12 @@
forceParse: true,
format: 'mm/dd/yyyy',
keyboardNavigation: true,
language: 'en',
minViewMode: 0,
+ multidate: false,
+ multidateSeparator: ',',
orientation: "auto",
rtl: false,
startDate: -Infinity,
startView: 0,
todayBtn: false,
@@ -1185,14 +1443,14 @@
{
clsName: 'years',
navFnc: 'FullYear',
navStep: 10
}],
- isLeapYear: function (year) {
+ isLeapYear: function(year){
return (((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0));
},
- getDaysInMonth: function (year, month) {
+ getDaysInMonth: function(year, month){
return [31, (DPGlobal.isLeapYear(year) ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month];
},
validParts: /dd?|DD?|mm?|MM?|yy(?:yy)?/g,
nonpunctuation: /[^ -\/:-@\[\u3400-\u9fff-`{-~\t\n\r]+/g,
parseFormat: function(format){
@@ -1203,23 +1461,26 @@
if (!separators || !separators.length || !parts || parts.length === 0){
throw new Error("Invalid date format.");
}
return {separators: separators, parts: parts};
},
- parseDate: function(date, format, language) {
- if (date instanceof Date) return date;
+ parseDate: function(date, format, language){
+ if (!date)
+ return undefined;
+ if (date instanceof Date)
+ return date;
if (typeof format === 'string')
format = DPGlobal.parseFormat(format);
- if (/^[\-+]\d+[dmwy]([\s,]+[\-+]\d+[dmwy])*$/.test(date)) {
- var part_re = /([\-+]\d+)([dmwy])/,
- parts = date.match(/([\-+]\d+)([dmwy])/g),
- part, dir;
+ var part_re = /([\-+]\d+)([dmwy])/,
+ parts = date.match(/([\-+]\d+)([dmwy])/g),
+ part, dir, i;
+ if (/^[\-+]\d+[dmwy]([\s,]+[\-+]\d+[dmwy])*$/.test(date)){
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]){
+ switch (part[2]){
case 'd':
date.setUTCDate(date.getUTCDate() + dir);
break;
case 'm':
date = Datepicker.prototype.moveMonth.call(Datepicker.prototype, date, dir);
@@ -1232,69 +1493,74 @@
break;
}
}
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); },
- yy: function(d,v){ return d.setUTCFullYear(2000+v); },
+ yyyy: function(d,v){
+ return d.setUTCFullYear(v);
+ },
+ yy: function(d,v){
+ return d.setUTCFullYear(2000+v);
+ },
m: function(d,v){
if (isNaN(d))
return d;
v -= 1;
- while (v<0) v += 12;
+ 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); }
+ 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) {
+ 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);
setters_map[s](_date, parsed[s]);
if (!isNaN(_date))
@@ -1303,10 +1569,12 @@
}
}
return date;
},
formatDate: function(date, format, language){
+ if (!date)
+ return '';
if (typeof format === 'string')
format = DPGlobal.parseFormat(format);
var val = {
d: date.getUTCDate(),
D: dates[language].daysShort[date.getUTCDay()],
@@ -1317,13 +1585,13 @@
yy: date.getUTCFullYear().toString().substring(2),
yyyy: date.getUTCFullYear()
};
val.dd = (val.d < 10 ? '0' : '') + val.d;
val.mm = (val.m < 10 ? '0' : '') + val.m;
- var date = [],
- seps = $.extend([], format.separators);
- for (var i=0, cnt = format.parts.length; i <= cnt; i++) {
+ date = [];
+ var seps = $.extend([], format.separators);
+ for (var i=0, cnt = format.parts.length; i <= cnt; i++){
if (seps.length)
date.push(seps.shift());
date.push(val[format.parts[i]]);
}
return date.join('');
@@ -1334,11 +1602,18 @@
'<th colspan="5" class="datepicker-switch"></th>'+
'<th class="next">»</th>'+
'</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">'+
'<table class=" table-condensed">'+
DPGlobal.headTemplate+
@@ -1380,16 +1655,17 @@
$(document).on(
'focus.datepicker.data-api click.datepicker.data-api',
'[data-provide="datepicker"]',
function(e){
var $this = $(this);
- if ($this.data('datepicker')) return;
+ if ($this.data('datepicker'))
+ return;
e.preventDefault();
// component click requires us to explicitly show it
$this.datepicker('show');
}
);
$(function(){
$('[data-provide="datepicker-inline"]').datepicker();
});
-}( window.jQuery ));
+}(window.jQuery));