From e5d13c60afd1f52c1f0dc261cc4167105b3ff7ee Mon Sep 17 00:00:00 2001 From: Craig Williams Date: Mon, 9 Feb 2026 10:12:08 +0000 Subject: [PATCH] Fix for bug in bootstrap-datepicker v1.10.0 --- inst/js/betterDateRangeInput.js | 11 +++++++---- inst/js/betterDateRangeInput.min.js | 2 +- inst/js/betterDateRangeInput.min.js.map | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/inst/js/betterDateRangeInput.js b/inst/js/betterDateRangeInput.js index 1857815..9fb88ff 100644 --- a/inst/js/betterDateRangeInput.js +++ b/inst/js/betterDateRangeInput.js @@ -126,7 +126,7 @@ $.extend(dateRangeInputBinding, { var $inputs = $el.find('input'); if (value.start !== void 0) { if (value.start === null || value.start.length == 0) { - $inputs.eq(0).val('').bsDatepicker('clearDates'); + $inputs.eq(0).val(''); } else { var start = this._newDate(value.start); $inputs.eq(0).bsDatepicker('setUTCDate', start); @@ -134,13 +134,16 @@ $.extend(dateRangeInputBinding, { } if (value.end !== void 0) { if (value.end === null || value.end.length == 0) { - $inputs.eq(1).val('').bsDatepicker('clearDates'); + $inputs.eq(1).val(''); } else { var end = this._newDate(value.end); $inputs.eq(1).bsDatepicker('setUTCDate', end); } } + $inputs.eq(0).bsDatepicker("update"); + $inputs.eq(1).bsDatepicker("update"); + $mainInput.data('autonext', autonext); }, subscribe: function(el, callback) { @@ -163,7 +166,7 @@ $.extend(dateRangeInputBinding, { var $endinput = $inputs.eq(1); if (data.hasOwnProperty('label')) { - $(el).find('label[for="' + el.id + 'Text"]').text(data.label); + $el.find('label[for="' + el.id + 'Text"]').text(data.label); } if (data.hasOwnProperty('min')) { @@ -183,7 +186,7 @@ $.extend(dateRangeInputBinding, { // if (data.hasOwnProperty('disabled')) { // } - $(el).trigger('change'); + $el.trigger('change'); }, initialize: function initialize(el) { var $el = $(el); diff --git a/inst/js/betterDateRangeInput.min.js b/inst/js/betterDateRangeInput.min.js index 41bcf9d..a6d44c6 100644 --- a/inst/js/betterDateRangeInput.min.js +++ b/inst/js/betterDateRangeInput.min.js @@ -1 +1 @@ -var dateRangeInputBinding=new Shiny.InputBinding;$.extend(dateRangeInputBinding,{_newDate:function(e){if(e instanceof Date)return e;var t=Date.parse(e);if(isNaN(t))return null;return new Date(t)},_setMin:function(e,t){var a=$(e);var n=a.closest(".input-daterange").eq(0);var i=false;if(n.data("autonext")==true){n.data("autonext",false);i=true}if(t==null){a.bsDatepicker("setStartDate",null);n.data("autonext",i);return}var r=this._newDate(t);if(r===null){n.data("autonext",i);return}var s=$(e).bsDatepicker("getUTCDate");a.bsDatepicker("setStartDate",this._utcDateAsLocal(r));if(r&&s&&r.getTime()>s.getTime()){a.bsDatepicker("clearDates")}else{a.bsDatepicker("setUTCDate",s)}n.data("autonext",i)},_setMax:function(e,t){var a=$(e);var n=a.closest(".input-daterange").eq(0);var i=false;if(n.data("autonext")==true){n.data("autonext",false);i=true}if(t==null){a.bsDatepicker("setEndDate",null);n.data("autonext",i);return}var r=this._newDate(t);if(r===null){n.data("autonext",i);return}var s=a.bsDatepicker("getUTCDate");a.bsDatepicker("setEndDate",this._utcDateAsLocal(r));if(r&&s&&r.getTime()s.getTime()){a.bsDatepicker("clearDates")}else{a.bsDatepicker("setUTCDate",s)}n.data("autonext",i)},_setMax:function(e,t){var a=$(e);var n=a.closest(".input-daterange").eq(0);var i=false;if(n.data("autonext")==true){n.data("autonext",false);i=true}if(t==null){a.bsDatepicker("setEndDate",null);n.data("autonext",i);return}var r=this._newDate(t);if(r===null){n.data("autonext",i);return}var s=a.bsDatepicker("getUTCDate");a.bsDatepicker("setEndDate",this._utcDateAsLocal(r));if(r&&s&&r.getTime()