diff options
| author | Felix Nagel <info@felixnagel.com> | 2012-01-22 14:47:21 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2012-01-22 14:47:21 +0100 |
| commit | 21d96f12f802f13c4c159ab9b2e0a6df3771be42 (patch) | |
| tree | c74f69270a62bc8a99e175bd3a94c7bc18433a48 /ui/jquery.ui.datepicker.js | |
| parent | 725023e30db10cc0a3ec2b8b9fda0ec80a4ab496 (diff) | |
| parent | 6800e1a2f97a7d8aaf20d065aa2ce517528e5068 (diff) | |
| download | jquery-ui-21d96f12f802f13c4c159ab9b2e0a6df3771be42.tar.gz jquery-ui-21d96f12f802f13c4c159ab9b2e0a6df3771be42.zip | |
Merge branch 'master' of github.com:jquery/jquery-ui into selectmenu
Diffstat (limited to 'ui/jquery.ui.datepicker.js')
| -rw-r--r-- | ui/jquery.ui.datepicker.js | 5 |
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; }); |