diff --git a/index.html b/index.html index 4040f73..cccb79d 100755 --- a/index.html +++ b/index.html @@ -856,7 +856,9 @@

Events

}) .bind('datepicker-apply',function(event,obj) { - /* This event will be triggered when user clicks on the apply button */ + /* This event will be triggered when user clicks on the apply button. + If opt.autoClose is true or opt.showTopbar is false this will also + be triggered when the final date is clicked */ console.log(obj); }) .bind('datepicker-close',function() diff --git a/src/jquery.daterangepicker.js b/src/jquery.daterangepicker.js index 7ee1e4a..a3d4367 100755 --- a/src/jquery.daterangepicker.js +++ b/src/jquery.daterangepicker.js @@ -920,13 +920,7 @@ box.find('.apply-btn').click(function() { closeDatePicker(); - var dateRange = getDateString(new Date(opt.start))+ opt.separator +getDateString(new Date(opt.end)); - $(self).trigger('datepicker-apply', - { - 'value': dateRange, - 'date1' : new Date(opt.start), - 'date2' : new Date(opt.end) - }); + triggerApply(); }); box.find('[custom]').click(function() @@ -1357,6 +1351,7 @@ showSelectedInfo(); showSelectedDays(); autoclose(); + if (opt.start && opt.end) triggerApply(); } @@ -1386,6 +1381,7 @@ showSelectedInfo(); showSelectedDays(); autoclose(); + triggerApply(); } function isValidTime(time) @@ -1559,6 +1555,26 @@ } } } + + function triggerApply() + { + if (opt.singleDate === true) { + var dateRange = getDateString(new Date(opt.start)); + $(self).trigger('datepicker-apply', + { + 'value': dateRange, + 'date1' : new Date(opt.start) + }); + } else { + var dateRange = getDateString(new Date(opt.start))+ opt.separator +getDateString(new Date(opt.end)); + $(self).trigger('datepicker-apply', + { + 'value': dateRange, + 'date1' : new Date(opt.start), + 'date2' : new Date(opt.end) + }); + } + } function checkSelectionValid() {