Skip to content

Commit 81976d7

Browse files
trentrichardsontrentrichardson
committed
Merge branch 'dev'
2 parents b523fe1 + 9bfd608 commit 81976d7

11 files changed

+24
-24
lines changed

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jqueryui-timepicker-addon",
3-
"version": "1.5.3",
3+
"version": "1.5.4",
44
"repository": {
55
"type": "git",
66
"url": "git://github.com/trentrichardson/jQuery-Timepicker-Addon.git"

‎dist/i18n/jquery-ui-timepicker-addon-i18n.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! jQuery Timepicker Addon - v1.5.3 - 2015-04-19
1+
/*! jQuery Timepicker Addon - v1.5.4 - 2015-05-11
22
* http://trentrichardson.com/examples/timepicker
33
* Copyright (c) 2015 Trent Richardson; Licensed MIT */
44

‎dist/i18n/jquery-ui-timepicker-addon-i18n.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ <h3>Requirements</h3>
113113

114114
<br />
115115
<h3>Version</h3>
116-
<p>Version 1.5.3</p>
116+
<p>Version 1.5.4</p>
117117

118-
<p>Last updated on 2015-04-19</p>
118+
<p>Last updated on 2015-05-11</p>
119119
<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under the MIT license.</p>
120120
<p><a href="http://trentrichardson.com/Impromptu/MIT-LICENSE.txt" title="MIT License">MIT License</a></p>
121121

@@ -912,8 +912,8 @@ <h3 id="range_examples">Time Ranges</h3>
912912
<div class="example-container">
913913
<p>Timepicker also includes some shortcut methods for ranges:</p>
914914
<div>
915-
<input type="text" name="range_example_2_start" id="range_example_2_start" value="21 Aug 2014 09:16" />
916-
<input type="text" name="range_example_2_end" id="range_example_2_end" value="21 Aug 2014 10:16" />
915+
<input type="text" name="range_example_2_start" id="range_example_2_start" value="" />
916+
<input type="text" name="range_example_2_end" id="range_example_2_end" value="" />
917917
</div>
918918
<pre>
919919
var startDateTextBox = $('#range_example_2_start');

‎dist/jquery-ui-timepicker-addon.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! jQuery Timepicker Addon - v1.5.3 - 2015-04-19
1+
/*! jQuery Timepicker Addon - v1.5.4 - 2015-05-11
22
* http://trentrichardson.com/examples/timepicker
33
* Copyright (c) 2015 Trent Richardson; Licensed MIT */
44
(function (factory) {
@@ -22,7 +22,7 @@
2222
*/
2323
$.extend($.ui, {
2424
timepicker: {
25-
version: "1.5.3"
25+
version: "1.5.4"
2626
}
2727
});
2828

@@ -209,7 +209,7 @@
209209
};
210210
for (i in overrides) {
211211
if (overrides.hasOwnProperty(i)) {
212-
fns[i] = opts[i] || null;
212+
fns[i] = opts[i] || this._defaults[i] || null;
213213
}
214214
}
215215

@@ -386,7 +386,7 @@
386386
// Prevent displaying twice
387387
if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) {
388388
var noDisplay = ' ui_tpicker_unit_hide',
389-
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>' +
389+
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>' +
390390
'<dd class="ui_tpicker_time '+ ((o.showTime) ? '' : noDisplay) + '"></dd>';
391391

392392
// Create the markup
@@ -2240,6 +2240,6 @@
22402240
/*
22412241
* Keep up with the version
22422242
*/
2243-
$.timepicker.version = "1.5.3";
2243+
$.timepicker.version = "1.5.4";
22442244

22452245
}));

‎dist/jquery-ui-timepicker-addon.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/jquery-ui-timepicker-addon.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎jquery-ui-timepicker-addon.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "jquery-ui-timepicker-addon",
33
"title": "jQuery Timepicker Addon",
44
"description": "A timepicker addon for jQueryUI datepicker.",
5-
"version": "1.5.3",
6-
"modified": "2015-04-19",
5+
"version": "1.5.4",
6+
"modified": "2015-05-11",
77
"homepage": "http://trentrichardson.com/examples/timepicker",
88
"author": {
99
"name": "Trent Richardson",

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"grunt-contrib-jshint": "~0.1.1",
1212
"grunt-contrib-jasmine": "~0.5.1",
1313
"grunt-contrib-concat": "~0.4.0",
14-
"grunt-contrib-uglify": "~0.1.1",
14+
"grunt-contrib-uglify": "~0.9.1",
1515
"grunt-contrib-watch": "~0.2.0",
1616
"grunt-contrib-clean": "~0.4.0",
1717
"grunt-contrib-copy": "~0.4.0",

‎src/docs/examples.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,8 @@ <h3 id="range_examples">Time Ranges</h3>
404404
<div class="example-container">
405405
<p>Timepicker also includes some shortcut methods for ranges:</p>
406406
<div>
407-
<input type="text" name="range_example_2_start" id="range_example_2_start" value="21 Aug 2014 09:16" />
408-
<input type="text" name="range_example_2_end" id="range_example_2_end" value="21 Aug 2014 10:16" />
407+
<input type="text" name="range_example_2_start" id="range_example_2_start" value="" />
408+
<input type="text" name="range_example_2_end" id="range_example_2_end" value="" />
409409
</div>
410410
<pre>
411411
var startDateTextBox = $('#range_example_2_start');

‎src/jquery-ui-timepicker-addon.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
};
216216
for (i in overrides) {
217217
if (overrides.hasOwnProperty(i)) {
218-
fns[i] = opts[i] || null;
218+
fns[i] = opts[i] || this._defaults[i] || null;
219219
}
220220
}
221221

@@ -392,7 +392,7 @@
392392
// Prevent displaying twice
393393
if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) {
394394
var noDisplay = ' ui_tpicker_unit_hide',
395-
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>' +
395+
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>' +
396396
'<dd class="ui_tpicker_time '+ ((o.showTime) ? '' : noDisplay) + '"></dd>';
397397

398398
// Create the markup

0 commit comments

Comments
 (0)