From 8d0be6d1e31ea2002b24d26f83be95999bb0b4be Mon Sep 17 00:00:00 2001 From: Matthew Maravillas Date: Thu, 1 Sep 2011 12:17:42 -0400 Subject: [PATCH] Out of band patch from official jQuery UI datepicker to support short circuting via beforeShow --- vendor/assets/javascripts/jquery-ui.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vendor/assets/javascripts/jquery-ui.js b/vendor/assets/javascripts/jquery-ui.js index dcf3731c..203de225 100644 --- a/vendor/assets/javascripts/jquery-ui.js +++ b/vendor/assets/javascripts/jquery-ui.js @@ -7758,7 +7758,12 @@ $.extend(Datepicker.prototype, { $.datepicker._curInst.dpDiv.stop(true, true); } var beforeShow = $.datepicker._get(inst, 'beforeShow'); - extendRemove(inst.settings, (beforeShow ? beforeShow.apply(input, [input, inst]) : {})); + var beforeShowSettings = beforeShow ? beforeShow.apply(input, [input, inst]) : {}; + if(beforeShowSettings === false){ + //false + return; + } + extendRemove(inst.settings, beforeShowSettings); inst.lastVal = null; $.datepicker._lastInput = input; $.datepicker._setDateFromField(inst);