Cleaned up date manipulation code. Updated data mapping to use ko.toJS.

This commit is contained in:
Alexis Lahouze
2013-01-13 12:00:44 +01:00
parent eac942bfc2
commit af30952228
7 changed files with 368 additions and 269 deletions

View File

@ -1,8 +1,8 @@
/* =========================================================
/*! =========================================================
* bootstrap-datepicker.js
* http://www.eyecon.ro/bootstrap-datepicker
* Original Idea: http://www.eyecon.ro/bootstrap-datepicker (Copyright 2012 Stefan Petre)
* Updated by AymKdn (http://kodono.info - https://github.com/Aymkdn/Datepicker-for-Bootstrap)
* =========================================================
* Copyright 2012 Stefan Petre
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -24,59 +24,31 @@
var Datepicker = function(element, options){
this.element = $(element);
this.format = DPGlobal.parseFormat(options.format||this.element.data('date-format')||'mm/dd/yyyy');
this.picker = $(DPGlobal.template)
.appendTo('body')
.on({
click: $.proxy(this.click, this),
mousedown: $.proxy(this.mousedown, this)
});
this.isInput = this.element.is('input');
this.picker = $(DPGlobal.template).appendTo('body').hide().on('mousedown.Datepicker',$.proxy(this.mousedown, this)).on('click.Datepicker',$.proxy(this.click, this));
this.isInput = this.element.is('input') || this.element.is('textarea');
this.component = this.element.is('.date') ? this.element.find('.add-on') : false;
if (this.isInput) {
this.element.on({
focus: $.proxy(this.show, this),
blur: $.proxy(this.hide, this),
keyup: $.proxy(this.update, this)
"focus.Datepicker": $.proxy(this.show, this),
"click.Datepicker": $.proxy(this.show, this),
"blur.Datepicker": $.proxy(this.blur, this),
"keyup.Datepicker": $.proxy(this.update, this),
"keydown.Datepicker": $.proxy(this.keydown, this)
});
} else {
if (this.component){
this.component.on('click', $.proxy(this.show, this));
this.component.on('click.Datepicker', $.proxy(this.show, this));
} else {
this.element.on('click', $.proxy(this.show, this));
this.element.on('click.Datepicker', $.proxy(this.show, this));
}
}
this.minViewMode = options.minViewMode||this.element.data('date-minviewmode')||0;
if (typeof this.minViewMode === 'string') {
switch (this.minViewMode) {
case 'months':
this.minViewMode = 1;
break;
case 'years':
this.minViewMode = 2;
break;
default:
this.minViewMode = 0;
break;
}
}
this.viewMode = options.viewMode||this.element.data('date-viewmode')||0;
if (typeof this.viewMode === 'string') {
switch (this.viewMode) {
case 'months':
this.viewMode = 1;
break;
case 'years':
this.viewMode = 2;
break;
default:
this.viewMode = 0;
break;
}
}
this.startViewMode = this.viewMode;
this.viewMode = 0;
this.weekStart = options.weekStart||this.element.data('date-weekstart')||0;
this.weekEnd = this.weekStart === 0 ? 6 : this.weekStart - 1;
this.scroll = (options.scroll != undefined ? options.scroll : true);
this.weekEnd = this.weekStart == 0 ? 6 : this.weekStart - 1;
this.fillDow();
this.fillMonths();
this.update();
@ -87,39 +59,34 @@
constructor: Datepicker,
show: function(e) {
$('div.datepicker.dropdown-menu').hide(); //make sure to hide all other calendars
this.picker.show();
this.height = this.component ? this.component.outerHeight() : this.element.outerHeight();
this.place();
$(window).on('resize', $.proxy(this.place, this));
if (e ) {
$(window).on('resize.Datepicker', $.proxy(this.place, this));
$('body').on('click.Datepicker', $.proxy(this.hide, this));
if (e) {
e.stopPropagation();
e.preventDefault();
}
if (!this.isInput) {
$(document).on('mousedown', $.proxy(this.hide, this));
$(document).on('mousedown.Datepicker', $.proxy(this.hide, this));
}
this.element.trigger({
type: 'show',
date: this.date
});
// make sure we see the datepicker
var elem = this.picker;
var docScrollTop = $(document).scrollTop();
var winHeight = $(window).height();
var elemTop = elem.position().top;
var elemHeight = elem.height();
if (this.scroll && docScrollTop+winHeight<elemTop+elemHeight)
$(document).scrollTop(elemTop-elemHeight);
},
hide: function(){
this.picker.hide();
$(window).off('resize', this.place);
this.viewMode = this.startViewMode;
this.showMode();
if (!this.isInput) {
$(document).off('mousedown', this.hide);
}
this.set();
this.element.trigger({
type: 'hide',
date: this.date
});
},
set: function() {
setValue: function() {
var formated = DPGlobal.formatDate(this.date, this.format);
if (!this.isInput) {
if (this.component){
@ -131,17 +98,6 @@
}
},
setValue: function(newDate) {
if (typeof newDate === 'string') {
this.date = DPGlobal.parseDate(newDate, this.format);
} else {
this.date = new Date(newDate);
}
this.set();
this.viewDate = new Date(this.date.getFullYear(), this.date.getMonth(), 1, 0, 0, 0, 0);
this.fill();
},
place: function(){
var offset = this.component ? this.component.offset() : this.element.offset();
this.picker.css({
@ -150,12 +106,13 @@
});
},
update: function(newDate){
update: function(){
var date = this.element.val();
this.date = DPGlobal.parseDate(
typeof newDate === 'string' ? newDate : (this.isInput ? this.element.prop('value') : this.element.data('date')),
date ? date : this.element.data('date'),
this.format
);
this.viewDate = new Date(this.date.getFullYear(), this.date.getMonth(), 1, 0, 0, 0, 0);
this.viewDate = new Date(this.date);
this.fill();
},
@ -195,7 +152,7 @@
html = [];
var clsName;
while(prevMonth.valueOf() < nextMonth) {
if (prevMonth.getDay() === this.weekStart) {
if (prevMonth.getDay() == this.weekStart) {
html.push('<tr>');
}
clsName = '';
@ -204,11 +161,11 @@
} else if (prevMonth.getMonth() > month) {
clsName += ' new';
}
if (prevMonth.valueOf() === currentDate) {
if (prevMonth.valueOf() == currentDate) {
clsName += ' active';
}
html.push('<td class="day'+clsName+'">'+prevMonth.getDate() + '</td>');
if (prevMonth.getDay() === this.weekEnd) {
if (prevMonth.getDay() == this.weekEnd) {
html.push('</tr>');
}
prevMonth.setDate(prevMonth.getDate()+1);
@ -221,7 +178,7 @@
.text(year)
.end()
.find('span').removeClass('active');
if (currentYear === year) {
if (currentYear == year) {
months.eq(this.date.getMonth()).addClass('active');
}
@ -234,17 +191,34 @@
.find('td');
year -= 1;
for (var i = -1; i < 11; i++) {
html += '<span class="year'+(i === -1 || i === 10 ? ' old' : '')+(currentYear === year ? ' active' : '')+'">'+year+'</span>';
html += '<span class="year'+(i == -1 || i == 10 ? ' old' : '')+(currentYear == year ? ' active' : '')+'">'+year+'</span>';
year += 1;
}
yearCont.html(html);
},
click: function(e) {
blur:function(e) {
},
hide: function(e){
this.picker.hide();
$(window).off('resize.Datepicker', this.place);
this.viewMode = 0;
this.showMode();
if (!this.isInput) {
$(document).off('mousedown.Datepicker', this.hide);
}
$('body').off('click.Datepicker',$.proxy(this.click, this));
},
click:function(e) {
e.stopPropagation();
e.preventDefault();
},
mousedown: function(e) {
e.stopPropagation();
e.preventDefault();
var target = $(e.target).closest('span, td, th');
if (target.length === 1) {
if (target.length == 1) {
switch(target[0].nodeName.toLowerCase()) {
case 'th':
switch(target[0].className) {
@ -256,10 +230,9 @@
this.viewDate['set'+DPGlobal.modes[this.viewMode].navFnc].call(
this.viewDate,
this.viewDate['get'+DPGlobal.modes[this.viewMode].navFnc].call(this.viewDate) +
DPGlobal.modes[this.viewMode].navStep * (target[0].className === 'prev' ? -1 : 1)
DPGlobal.modes[this.viewMode].navStep * (target[0].className == 'prev' ? -1 : 1)
);
this.fill();
this.set();
break;
}
break;
@ -271,17 +244,8 @@
var year = parseInt(target.text(), 10)||0;
this.viewDate.setFullYear(year);
}
if (this.viewMode !== 0) {
this.date = new Date(this.viewDate);
this.element.trigger({
type: 'changeDate',
date: this.date,
viewMode: DPGlobal.modes[this.viewMode].clsName
});
}
this.showMode(-1);
this.fill();
this.set();
break;
case 'td':
if (target.is('.day')){
@ -294,42 +258,43 @@
}
var year = this.viewDate.getFullYear();
this.date = new Date(year, month, day,0,0,0,0);
this.viewDate = new Date(year, month, Math.min(28, day),0,0,0,0);
this.viewDate = new Date(year, month, day,0,0,0,0);
this.fill();
this.set();
this.setValue();
this.element.trigger({
type: 'changeDate',
date: this.date,
viewMode: DPGlobal.modes[this.viewMode].clsName
date: this.date
});
this.hide();
}
break;
}
}
},
mousedown: function(e){
e.stopPropagation();
e.preventDefault();
},
keydown:function(e) {
var keyCode = e.keyCode || e.which;
if (keyCode == 9) this.hide(); // when hiting TAB, for accessibility
},
showMode: function(dir) {
if (dir) {
this.viewMode = Math.max(this.minViewMode, Math.min(2, this.viewMode + dir));
this.viewMode = Math.max(0, Math.min(2, this.viewMode + dir));
}
this.picker.find('>div').hide().filter('.datepicker-'+DPGlobal.modes[this.viewMode].clsName).show();
}
},
destroy: function() { this.element.removeData("datepicker").off(".Datepicker"); this.picker.remove() }
};
$.fn.datepicker = function ( option, val ) {
$.fn.datepicker = function ( option ) {
return this.each(function () {
var $this = $(this),
data = $this.data('datepicker'),
options = typeof option === 'object' && option;
options = typeof option == 'object' && option;
if (!data) {
$this.data('datepicker', (data = new Datepicker(this, $.extend({}, $.fn.datepicker.defaults,options))));
}
if (typeof option === 'string') data[option](val);
if (typeof option == 'string') data[option]();
});
};
@ -368,22 +333,20 @@
return [31, (DPGlobal.isLeapYear(year) ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month]
},
parseFormat: function(format){
var separator = format.match(/[.\/\-\s].*?/),
var separator = format.match(/[.\/-].*?/),
parts = format.split(/\W+/);
if (!separator || !parts || parts.length === 0){
if (!separator || !parts || parts.length == 0){
throw new Error("Invalid date format.");
}
return {separator: separator, parts: parts};
},
parseDate: function(date, format) {
var today=new Date();
if (!date) date="";
var parts = date.split(format.separator),
date = new Date(),
date = new Date(today.getFullYear(),today.getMonth(),today.getDate(),0,0,0),
val;
date.setHours(0);
date.setMinutes(0);
date.setSeconds(0);
date.setMilliseconds(0);
if (parts.length === format.parts.length) {
if (parts.length == format.parts.length) {
for (var i=0, cnt = format.parts.length; i < cnt; i++) {
val = parseInt(parts[i], 10)||1;
switch(format.parts[i]) {
@ -423,9 +386,9 @@
},
headTemplate: '<thead>'+
'<tr>'+
'<th class="prev">&lsaquo;</th>'+
'<th class="prev"><i class="icon-arrow-left"/></th>'+
'<th colspan="5" class="switch"></th>'+
'<th class="next">&rsaquo;</th>'+
'<th class="next"><i class="icon-arrow-right"/></th>'+
'</tr>'+
'</thead>',
contTemplate: '<tbody><tr><td colspan="7"></td></tr></tbody>'