diff options
| author | Trent Richardson <trentrichardson@users.noreply.github.com> | 2014-01-27 06:45:48 -0800 |
|---|---|---|
| committer | Trent Richardson <trentrichardson@users.noreply.github.com> | 2014-01-27 06:45:48 -0800 |
| commit | d4b12fbdda7c356ab745bd595a97c0c4afb50f1c (patch) | |
| tree | fad0132a5d59a7ba248beead905e3572eb53acc3 /src | |
| parent | 761d0f354e92fc68677ae33aa7021102f3e9aeba (diff) | |
| parent | 80cf4dc4620f2f93ad1955f66738763a4823fd77 (diff) | |
| download | jQuery-Timepicker-Addon-d4b12fbdda7c356ab745bd595a97c0c4afb50f1c.zip jQuery-Timepicker-Addon-d4b12fbdda7c356ab745bd595a97c0c4afb50f1c.tar.gz jQuery-Timepicker-Addon-d4b12fbdda7c356ab745bd595a97c0c4afb50f1c.tar.bz2 | |
Merge pull request #688 from spmorganjr/dev
Issue # 687 - Calendar remians open after date selection when showTimepicker = false
Diffstat (limited to 'src')
| -rw-r--r-- | src/jquery-ui-timepicker-addon.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js index 71ec2cd..fe1e9e1 100644 --- a/src/jquery-ui-timepicker-addon.js +++ b/src/jquery-ui-timepicker-addon.js @@ -1348,7 +1348,7 @@ var inst = this._getInst($(id)[0]), tp_inst = this._get(inst, 'timepicker'); - if (tp_inst) { + if (tp_inst && inst.settings.showTimepicker) { tp_inst._limitMinMaxDateTime(inst, true); inst.inline = inst.stay_open = true; //This way the onSelect handler called from calendarpicker get the full dateTime |