aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-01-20 08:23:58 -0800
committerScott González <scott.gonzalez@gmail.com>2012-01-20 08:23:58 -0800
commitc518774aa30d54c02a4898f36f2907aa839624da (patch)
tree22ca51eee62959c2fb1db700f81544ecbccd33f1 /ui
parent09cf7092f83a95bfff14beffec5995b77d92552d (diff)
parent82cf9e297fd78730dadd9a486d6871eca72455dd (diff)
downloadjquery-ui-c518774aa30d54c02a4898f36f2907aa839624da.tar.gz
jquery-ui-c518774aa30d54c02a4898f36f2907aa839624da.zip
Merge pull request #569 from ryanolton/master
Fixed #5818 - multiple DatePickers won't trigger close event
Diffstat (limited to 'ui')
-rw-r--r--ui/jquery.ui.datepicker.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 45ddf8678..5915d4027 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -233,7 +233,10 @@ $.extend(Datepicker.prototype, {
inst.trigger.click(function() {
if ($.datepicker._datepickerShowing && $.datepicker._lastInput == input[0])
$.datepicker._hideDatepicker();
- else
+ else if ($.datepicker._datepickerShowing && $.datepicker._lastInput != input[0]) {
+ $.datepicker._hideDatepicker();
+ $.datepicker._showDatepicker(input[0]);
+ } else
$.datepicker._showDatepicker(input[0]);
return false;
});