From d8d9436f5105f393f00c1af77fbf59e11517d53e Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Tue, 22 Oct 2013 11:35:24 +0200 Subject: [PATCH] // add date change trigger --- admin-dev/themes/default/js/calendar.js | 15 ++++++++++++--- admin-dev/themes/default/js/date-range-picker.js | 4 ++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/admin-dev/themes/default/js/calendar.js b/admin-dev/themes/default/js/calendar.js index 76815e5a4..b011af369 100644 --- a/admin-dev/themes/default/js/calendar.js +++ b/admin-dev/themes/default/js/calendar.js @@ -152,6 +152,8 @@ function updatePickerFromInput() { datepickerEnd.setEnd($("#date-end").val()); datepickerEnd.update(); + $('#date-start').trigger('change'); + if ($('#datepicker-compare').attr("checked")) { if ($('#compare-options').val() == 1) setPreviousPeriod(); @@ -172,6 +174,7 @@ function setDayPeriod() { date = new Date(); $("#date-start").val(date.format($("#date-start").data('date-format'))); $("#date-end").val(date.format($("#date-end").data('date-format'))); + $('#date-start').trigger('change'); updatePickerFromInput(); } @@ -181,6 +184,7 @@ function setPreviousDayPeriod() { date = date.subDays(1); $("#date-start").val(date.format($("#date-start").data('date-format'))); $("#date-end").val(date.format($("#date-end").data('date-format'))); + $('#date-start').trigger('change'); updatePickerFromInput(); } @@ -189,7 +193,8 @@ function setMonthPeriod() { date = new Date(); $("#date-end").val(date.format($("#date-end").data('date-format'))); date = new Date(date.setDate(1)); - $("#date-start").val(date.format($("#date-start").data('date-format'))); + $("#date-start").val(date.format($("#date-start").data('date-format'))); + $('#date-start').trigger('change'); updatePickerFromInput(); } @@ -199,7 +204,8 @@ function setPreviousMonthPeriod() { date = date.subMonths(1); $("#date-end").val(date.format($("#date-end").data('date-format'))); date = new Date(date.setDate(1)); - $("#date-start").val(date.format($("#date-start").data('date-format'))); + $("#date-start").val(date.format($("#date-start").data('date-format'))); + $('#date-start').trigger('change'); updatePickerFromInput(); } @@ -209,6 +215,7 @@ function setYearPeriod() { $("#date-end").val(date.format($("#date-end").data('date-format'))); date = new Date(date.getFullYear(), 0, 1); $("#date-start").val(date.format($("#date-start").data('date-format'))); + $('#date-start').trigger('change'); updatePickerFromInput(); } @@ -218,7 +225,8 @@ function setPreviousYearPeriod() { date = date.subYears(1); $("#date-end").val(date.format($("#date-end").data('date-format'))); date = new Date(date.getFullYear(), 0, 1); - $("#date-start").val(date.format($("#date-start").data('date-format'))); + $("#date-start").val(date.format($("#date-start").data('date-format'))); + $('#date-start').trigger('change'); updatePickerFromInput(); } @@ -310,6 +318,7 @@ $( document ).ready(function() { $('#datepicker').show(function() { $('#date-start').focus(); + $('#date-start').trigger('change'); }); $('#datepicker-compare').click(function() { diff --git a/admin-dev/themes/default/js/date-range-picker.js b/admin-dev/themes/default/js/date-range-picker.js index 09b217283..92f467c6f 100644 --- a/admin-dev/themes/default/js/date-range-picker.js +++ b/admin-dev/themes/default/js/date-range-picker.js @@ -421,6 +421,7 @@ target.addClass("start-selected"); start = target.data("val"); $("#date-start").val(DPGlobal.formatDate(new Date(start), DPGlobal.parseFormat('Y-m-d'))); + $('#date-start').trigger('change'); } if(!switched) {click = 1;} else {click = 2;} @@ -455,6 +456,7 @@ $("#date-end").val(DPGlobal.formatDate(new Date(end), DPGlobal.parseFormat('Y-m-d'))); click = 2; $("#date-end").removeClass("input-selected").addClass("input-complete"); + $('#date-end').trigger('change'); } } } @@ -566,6 +568,7 @@ { end = start; $("#date-end").val(DPGlobal.formatDate(new Date(start), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected"); + $('#date-end').trigger('change'); $("#date-start").val(null).focus().addClass("input-selected"); $("#datepicker .start-selected").removeClass("start-selected").addClass("end-selected"); start = null; @@ -575,6 +578,7 @@ { start = end; $("#date-start").val(DPGlobal.formatDate(new Date(end), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected"); + $('#date-start').trigger('change'); $("#date-end").val(null).focus().addClass("input-selected"); $("#datepicker .end-selected").removeClass("end-selected").addClass("start-selected"); end = null;