diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2012-02-08 13:42:55 -0500 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2012-02-08 13:43:34 -0500 |
| commit | dc12b4d3109d2b5f611ce2bd8d9caae484cc772b (patch) | |
| tree | 6c05188eb72584f264e8c9eebed63f5e0f1826b2 | |
| parent | 28fb436b7b75de01cc1caf3132f56381b6c7c190 (diff) | |
| download | jquery-ui-dc12b4d3109d2b5f611ce2bd8d9caae484cc772b.tar.gz jquery-ui-dc12b4d3109d2b5f611ce2bd8d9caae484cc772b.zip | |
Datepicker: Allow descendant elements in triggers. Fixes #8107 - Closing the datepicker via the provided button does not work in Chrome when the button contains other non-text elements.
(cherry picked from commit c964894b9b75dc7df62660725967a1f7a526a3ec)
| -rw-r--r-- | ui/jquery.ui.datepicker.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js index fbf1f4c45..0b83af289 100644 --- a/ui/jquery.ui.datepicker.js +++ b/ui/jquery.ui.datepicker.js @@ -845,7 +845,7 @@ $.extend(Datepicker.prototype, { if ( ( ( $target[0].id != $.datepicker._mainDivId && $target.parents('#' + $.datepicker._mainDivId).length == 0 && !$target.hasClass($.datepicker.markerClassName) && - !$target.hasClass($.datepicker._triggerClass) && + !$target.closest("." + $.datepicker._triggerClass).length && $.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI) ) ) || ( $target.hasClass($.datepicker.markerClassName) && $.datepicker._curInst != inst ) ) $.datepicker._hideDatepicker(); |