// Fix month overlapping on datapicker
This commit is contained in:
1 parent
aefd5947d2
commit
04e760512f
2 files changed
+31
-6
No files matched your search
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
//click action
|
//click action
|
||||||
!function( $ ) {
|
!function( $ ) {
|
||||||
var click, switched, val, start, end, over;
|
var click, switched, val, start, end, over
|
||||||
|
|
||||||
// Picker object
|
// Picker object
|
||||||
var Datepicker = function(element, options){
|
var Datepicker = function(element, options){
|
||||||
@@ -264,6 +264,14 @@
|
|||||||
this.viewDate['get'+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.date = new Date(this.viewDate);
|
||||||
|
this.element.trigger({
|
||||||
|
type: 'changeDate',
|
||||||
|
date: this.date,
|
||||||
|
viewMode: DPGlobal.modes[this.viewMode].clsName
|
||||||
|
});
|
||||||
|
|
||||||
this.fill();
|
this.fill();
|
||||||
this.set();
|
this.set();
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -91,12 +91,29 @@
|
|||||||
var end = '{$date_to}';
|
var end = '{$date_to}';
|
||||||
|
|
||||||
{literal}
|
{literal}
|
||||||
$('.datepicker1').datepicker({"dates": translated_dates, "weekStart": 1, "start": start, "end": end});
|
var datepickerStart = $('.datepicker1').datepicker({
|
||||||
$('.datepicker2').datepicker({"dates": translated_dates, "weekStart": 1, "start": start, "end": end});
|
"dates": translated_dates,
|
||||||
//$('.datepicker1').datepicker('range');
|
"weekStart": 1,
|
||||||
//$('.datepicker2').range();
|
"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}
|
{/literal}
|
||||||
|
|
||||||
$("#date-start").focus().addClass("input-selected");
|
$("#date-start").focus().addClass("input-selected");
|
||||||
$('#datepicker-cancel').click(function() {
|
$('#datepicker-cancel').click(function() {
|
||||||
$('#datepicker').slideUp(200);
|
$('#datepicker').slideUp(200);
|
||||||
|
|||||||
Reference in new issue
Block a user