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:42:55 -0500 |
| commit | c964894b9b75dc7df62660725967a1f7a526a3ec (patch) | |
| tree | b24b17981f8d2e4e19b53343b704243c31b28f88 /ui | |
| parent | a3abb3b5f5db19196c66a5b25e2c93eec7a0cd1f (diff) | |
| download | jquery-ui-c964894b9b75dc7df62660725967a1f7a526a3ec.tar.gz jquery-ui-c964894b9b75dc7df62660725967a1f7a526a3ec.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.
Diffstat (limited to 'ui')
| -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 5915d4027..034ad774e 100644 --- a/ui/jquery.ui.datepicker.js +++ b/ui/jquery.ui.datepicker.js @@ -849,7 +849,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(); |