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 /src | |
| 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 'src')
| -rw-r--r-- | src/docs/examples.html | 4 | ||||
| -rw-r--r-- | src/jquery-ui-timepicker-addon.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/docs/examples.html b/src/docs/examples.html index a04af2f..ae94ce6 100644 --- a/src/docs/examples.html +++ b/src/docs/examples.html @@ -404,8 +404,8 @@ endDateTextBox.datetimepicker({ <div class="example-container"> <p>Timepicker also includes some shortcut methods for ranges:</p> <div> - <input type="text" name="range_example_2_start" id="range_example_2_start" value="21 Aug 2014 09:16" /> - <input type="text" name="range_example_2_end" id="range_example_2_end" value="21 Aug 2014 10:16" /> + <input type="text" name="range_example_2_start" id="range_example_2_start" value="" /> + <input type="text" name="range_example_2_end" id="range_example_2_end" value="" /> </div> <pre> var startDateTextBox = $('#range_example_2_start'); diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js index b156de8..a9bc63e 100644 --- a/src/jquery-ui-timepicker-addon.js +++ b/src/jquery-ui-timepicker-addon.js @@ -215,7 +215,7 @@ }; for (i in overrides) { if (overrides.hasOwnProperty(i)) { - fns[i] = opts[i] || null; + fns[i] = opts[i] || this._defaults[i] || null; } } @@ -392,7 +392,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 |