diff options
| author | Trent <trentdrichardson@gmail.com> | 2015-05-11 11:02:47 -0400 |
|---|---|---|
| committer | Trent <trentdrichardson@gmail.com> | 2015-05-11 11:02:47 -0400 |
| commit | 81976d7ddbd2bfe5a4cb0b1bb0791c7c348aa7be (patch) | |
| tree | 78d3feb30718f17dbb3f8ab37527a8cbb1840b90 /dist/jquery-ui-timepicker-addon.js | |
| parent | b523fe1daf766650e1dde15322ac61e99739324b (diff) | |
| parent | 9bfd60812b517a13f121d3c45a202f662f9d67af (diff) | |
| download | jQuery-Timepicker-Addon-81976d7ddbd2bfe5a4cb0b1bb0791c7c348aa7be.zip jQuery-Timepicker-Addon-81976d7ddbd2bfe5a4cb0b1bb0791c7c348aa7be.tar.gz jQuery-Timepicker-Addon-81976d7ddbd2bfe5a4cb0b1bb0791c7c348aa7be.tar.bz2 | |
Merge branch 'dev'
Diffstat (limited to 'dist/jquery-ui-timepicker-addon.js')
| -rw-r--r-- | dist/jquery-ui-timepicker-addon.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dist/jquery-ui-timepicker-addon.js b/dist/jquery-ui-timepicker-addon.js index 247050d..1fc1337 100644 --- a/dist/jquery-ui-timepicker-addon.js +++ b/dist/jquery-ui-timepicker-addon.js @@ -1,4 +1,4 @@ -/*! jQuery Timepicker Addon - v1.5.3 - 2015-04-19 +/*! jQuery Timepicker Addon - v1.5.4 - 2015-05-11 * http://trentrichardson.com/examples/timepicker * Copyright (c) 2015 Trent Richardson; Licensed MIT */ (function (factory) { @@ -22,7 +22,7 @@ */ $.extend($.ui, { timepicker: { - version: "1.5.3" + version: "1.5.4" } }); @@ -209,7 +209,7 @@ }; for (i in overrides) { if (overrides.hasOwnProperty(i)) { - fns[i] = opts[i] || null; + fns[i] = opts[i] || this._defaults[i] || null; } } @@ -386,7 +386,7 @@ // Prevent displaying twice if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) { var noDisplay = ' ui_tpicker_unit_hide', - html = '<div class="ui-timepicker-div' + (o.isRTL ? ' ui-timepicker-rtl' : '') + (o.oneLine && o.controlType === 'select' ? ' ui-timepicker-oneLine' : '') + '"><dl>' + '<dt class="ui_tpicker_time_label"' + ((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' + + html = '<div class="ui-timepicker-div' + (o.isRTL ? ' ui-timepicker-rtl' : '') + (o.oneLine && o.controlType === 'select' ? ' ui-timepicker-oneLine' : '') + '"><dl>' + '<dt class="ui_tpicker_time_label' + ((o.showTime) ? '' : noDisplay) + '">' + o.timeText + '</dt>' + '<dd class="ui_tpicker_time '+ ((o.showTime) ? '' : noDisplay) + '"></dd>'; // Create the markup @@ -2240,6 +2240,6 @@ /* * Keep up with the version */ - $.timepicker.version = "1.5.3"; + $.timepicker.version = "1.5.4"; })); |