// Fix month overlapping on datapicker
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
|
||||
//click action
|
||||
!function( $ ) {
|
||||
var click, switched, val, start, end, over;
|
||||
var click, switched, val, start, end, over
|
||||
|
||||
// Picker object
|
||||
var Datepicker = function(element, options){
|
||||
@@ -264,6 +264,14 @@
|
||||
this.viewDate['get'+DPGlobal.modes[this.viewMode].navFnc].call(this.viewDate) +
|
||||
DPGlobal.modes[this.viewMode].navStep * (target[0].className === 'prev' ? -1 : 1)
|
||||
);
|
||||
|
||||
this.date = new Date(this.viewDate);
|
||||
this.element.trigger({
|
||||
type: 'changeDate',
|
||||
date: this.date,
|
||||
viewMode: DPGlobal.modes[this.viewMode].clsName
|
||||
});
|
||||
|
||||
this.fill();
|
||||
this.set();
|
||||
break;
|
||||
|
||||
@@ -91,12 +91,29 @@
|
||||
var end = '{$date_to}';
|
||||
|
||||
{literal}
|
||||
$('.datepicker1').datepicker({"dates": translated_dates, "weekStart": 1, "start": start, "end": end});
|
||||
$('.datepicker2').datepicker({"dates": translated_dates, "weekStart": 1, "start": start, "end": end});
|
||||
//$('.datepicker1').datepicker('range');
|
||||
//$('.datepicker2').range();
|
||||
var datepickerStart = $('.datepicker1').datepicker({
|
||||
"dates": translated_dates,
|
||||
"weekStart": 1,
|
||||
"start": start,
|
||||
"end": end
|
||||
}).on('changeDate', function(ev){
|
||||
if (ev.date.valueOf() >= datepickerEnd.date.valueOf()){
|
||||
datepickerEnd.setValue(ev.date.setMonth(ev.date.getMonth()+1));
|
||||
}
|
||||
}).data('datepicker');
|
||||
|
||||
var datepickerEnd = $('.datepicker2').datepicker({
|
||||
"dates": translated_dates,
|
||||
"weekStart": 1,
|
||||
"start":start,
|
||||
"end": end
|
||||
}).on('changeDate', function(ev){
|
||||
if (ev.date.valueOf() <= datepickerStart.date.valueOf()){
|
||||
datepickerStart.setValue(ev.date.setMonth(ev.date.getMonth()-1));
|
||||
}
|
||||
}).data('datepicker');
|
||||
{/literal}
|
||||
|
||||
|
||||
$("#date-start").focus().addClass("input-selected");
|
||||
$('#datepicker-cancel').click(function() {
|
||||
$('#datepicker').slideUp(200);
|
||||
|
||||
Reference in New Issue
Block a user