jingrow/air-datepicker
1
0
Fork 0
mirror of https://github.com/frappe/air-datepicker.git synced 2026-01-14 11:01:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed current date detection method

Browse Source
This commit is contained in:
t1m0n 2015-10-19 12:27:46 +03:00
parent f8b762c481
commit a364079130
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dist/js/datepicker.js vendored
View File

@ -47,7 +47,7 @@ var Datepicker;
this.currentDate = this.opts.start; this.currentDate = this.opts.start;
this.currentView = this.opts.defaultView; this.currentView = this.opts.defaultView;
this.selectedDate = ''; this.selectedDate = [];
this.views = {}; this.views = {};
this.init() this.init()
@ -110,7 +110,6 @@ var Datepicker;
this.date = new Date(d.year + 10, 0, 1); this.date = new Date(d.year + 10, 0, 1);
break; break;
} }
}, },
prev: function () { prev: function () {
@ -409,11 +408,15 @@ Datepicker.Cell = function () {
}, },
_getDayHtml: function (date) { _getDayHtml: function (date) {
var _class = "datepicker--cell datepicker--cell-day"; var _class = "datepicker--cell datepicker--cell-day",
currentDate = new Date(),
d = Datepicker.getParsedDate(date);
if (this.d.isWeekend(date.getDay())) _class += " -weekend-"; if (this.d.isWeekend(d.day)) _class += " -weekend-";
if (date.getMonth() != this.d.currentDate.getMonth()) _class += " -another-month-"; if (d.month != this.d.parsedDate.month) _class += " -another-month-";
if (date.getDate() == new Date().getDate()) _class += ' -current-'; if (d.date == currentDate.getDate() &&
d.month == currentDate.getMonth() &&
d.year == currentDate.getFullYear()) _class += ' -current-';
return '<div class="' + _class + '" data-date="' + date.getDate() + '">' + date.getDate() + '</div>'; return '<div class="' + _class + '" data-date="' + date.getDate() + '">' + date.getDate() + '</div>';
}, },

12
js/datepicker/body.js
View File

@ -85,11 +85,15 @@
}, },
_getDayHtml: function (date) { _getDayHtml: function (date) {
var _class = "datepicker--cell datepicker--cell-day"; var _class = "datepicker--cell datepicker--cell-day",
currentDate = new Date(),
d = Datepicker.getParsedDate(date);
if (this.d.isWeekend(date.getDay())) _class += " -weekend-"; if (this.d.isWeekend(d.day)) _class += " -weekend-";
if (date.getMonth() != this.d.currentDate.getMonth()) _class += " -another-month-"; if (d.month != this.d.parsedDate.month) _class += " -another-month-";
if (date.getDate() == new Date().getDate()) _class += ' -current-'; if (d.date == currentDate.getDate() &&
d.month == currentDate.getMonth() &&
d.year == currentDate.getFullYear()) _class += ' -current-';
return '<div class="' + _class + '" data-date="' + date.getDate() + '">' + date.getDate() + '</div>'; return '<div class="' + _class + '" data-date="' + date.getDate() + '">' + date.getDate() + '</div>';
}, },

3
js/datepicker/datepicker.js
View File

@ -47,7 +47,7 @@ var Datepicker;
this.currentDate = this.opts.start; this.currentDate = this.opts.start;
this.currentView = this.opts.defaultView; this.currentView = this.opts.defaultView;
this.selectedDate = ''; this.selectedDate = [];
this.views = {}; this.views = {};
this.init() this.init()
@ -110,7 +110,6 @@ var Datepicker;
this.date = new Date(d.year + 10, 0, 1); this.date = new Date(d.year + 10, 0, 1);
break; break;
} }
}, },
prev: function () { prev: function () {