Skip to content

Commit 80f5050

Browse files
Improves $.timepicker.log argument pass through, add range example section to docs
1 parent 62efd45 commit 80f5050

8 files changed

+89
-26
lines changed

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.4.6 - 2014-08-09
1+
/*! jQuery Timepicker Addon - v1.4.7 - 2014-08-09
22
* http://trentrichardson.com/examples/timepicker
33
* Copyright (c) 2014 Trent Richardson; Licensed MIT */
44

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

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/index.html

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ <h3>Requirements</h3>
126126

127127
<br />
128128
<h3>Version</h3>
129-
<p>Version 1.4.6</p>
129+
<p>Version 1.4.7</p>
130130

131131
<p>Last updated on 2014-08-09</p>
132132
<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under the MIT license.</p>
@@ -525,6 +525,7 @@ <h2>Examples</h2>
525525
<li><a href="#slider_examples" title="Slider Modifications">Slider Modifications</a></li>
526526
<li><a href="#alt_examples" title="Alternate Field">Alternate Fields</a></li>
527527
<li><a href="#rest_examples" title="Time Restraints">Time Restraints</a></li>
528+
<li><a href="#range_examples" title="Time Ranges">Time Ranges</a></li>
528529
<li><a href="#utility_examples" title="Utilities">Utilities</a></li>
529530
</ul>
530531

@@ -848,17 +849,20 @@ <h3 id="rest_examples">Time Restraints</h3>
848849
</pre>
849850
</div>
850851

852+
853+
<h3 id="range_examples">Time Ranges</h3>
854+
851855
<!-- ============= example -->
852856
<div class="example-container">
853857
<p>Restrict a start and end date by using onSelect and onClose events for more control over functionality:</p>
854858
<p>For more examples and advanced usage grab the <a href="http://trentrichardson.com/ebooks/handling-time/" title="Handling Time eBook">Handling Time eBook</a>.</p>
855859
<div>
856-
<input type="text" name="rest_example_4_start" id="rest_example_4_start" value="" />
857-
<input type="text" name="rest_example_4_end" id="rest_example_4_end" value="" />
860+
<input type="text" name="range_example_1_start" id="range_example_1_start" value="08/20/2014 09:22 -0400" />
861+
<input type="text" name="range_example_1_end" id="range_example_1_end" value="08/21/2014 08:00 -0400" />
858862
</div>
859863
<pre>
860-
var startDateTextBox = $('#rest_example_4_start');
861-
var endDateTextBox = $('#rest_example_4_end');
864+
var startDateTextBox = $('#range_example_1_start');
865+
var endDateTextBox = $('#range_example_1_end');
862866

863867
startDateTextBox.datetimepicker({
864868
timeFormat: 'HH:mm z',
@@ -894,6 +898,31 @@ <h3 id="rest_examples">Time Restraints</h3>
894898
startDateTextBox.datetimepicker('option', 'maxDate', endDateTextBox.datetimepicker('getDate') );
895899
}
896900
});
901+
</pre>
902+
</div>
903+
904+
<!-- ============= example -->
905+
<div class="example-container">
906+
<p>Timepicker also includes some shortcut methods for ranges:</p>
907+
<div>
908+
<input type="text" name="range_example_2_start" id="range_example_2_start" value="21 Aug 2014 09:16" />
909+
<input type="text" name="range_example_2_end" id="range_example_2_end" value="21 Aug 2014 10:16" />
910+
</div>
911+
<pre>
912+
var startDateTextBox = $('#range_example_2_start');
913+
var endDateTextBox = $('#range_example_2_end');
914+
915+
$.timepicker.datetimeRange(
916+
startDateTextBox,
917+
endDateTextBox,
918+
{
919+
minInterval: (1000*60*60),
920+
dateFormat: 'dd M yy',
921+
timeFormat: 'HH:mm',
922+
start: {}, // start picker options
923+
end: {} // end picker options
924+
}
925+
);
897926
</pre>
898927
</div>
899928

dist/jquery-ui-timepicker-addon.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! jQuery Timepicker Addon - v1.4.6 - 2014-08-09
1+
/*! jQuery Timepicker Addon - v1.4.7 - 2014-08-09
22
* http://trentrichardson.com/examples/timepicker
33
* Copyright (c) 2014 Trent Richardson; Licensed MIT */
44
(function ($) {
@@ -16,7 +16,7 @@
1616
*/
1717
$.extend($.ui, {
1818
timepicker: {
19-
version: "1.4.6"
19+
version: "1.4.7"
2020
}
2121
});
2222

@@ -1065,10 +1065,7 @@
10651065
o[opts] = val;
10661066
}
10671067
else { o = opts; }
1068-
/*
1069-
* Check for existence of properties when determining which value to use instead of just truthiness to avoid o.min evaulating to false when its value is 0
1070-
*/
1071-
return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), ('min' in o) ? o.min : $t.data('min'), ('max' in o) ? o.max : $t.data('max'), ('step' in o) ? o.step : $t.data('step'));
1068+
return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min || $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step'));
10721069
},
10731070
value: function (tp_inst, obj, unit, val) {
10741071
var $t = obj.children('select');
@@ -1826,6 +1823,7 @@
18261823
if (value === undefined) {
18271824
return this._base_optionDatepicker.call($.datepicker, target, name);
18281825
}
1826+
18291827
return this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
18301828
};
18311829

@@ -2130,6 +2128,7 @@
21302128
date.setMilliseconds(date.getMilliseconds() - options.minInterval);
21312129
}
21322130
}
2131+
21332132
if (date.getTime) {
21342133
other[method].call(other, 'option', option, date);
21352134
}
@@ -2155,8 +2154,10 @@
21552154
}, options, options.end));
21562155

21572156
checkDates(startTime, endTime);
2157+
21582158
selected(startTime, endTime, 'minDate');
21592159
selected(endTime, startTime, 'maxDate');
2160+
21602161
return $([startTime.get(0), endTime.get(0)]);
21612162
};
21622163

@@ -2165,9 +2166,9 @@
21652166
* @param {Object} err pass any type object to log to the console during error or debugging
21662167
* @return {void}
21672168
*/
2168-
$.timepicker.log = function (err) {
2169+
$.timepicker.log = function () {
21692170
if (window.console) {
2170-
window.console.log(err);
2171+
window.console.log.apply(window.console, Array.prototype.slice.call(arguments));
21712172
}
21722173
};
21732174

@@ -2201,6 +2202,6 @@
22012202
/*
22022203
* Keep up with the version
22032204
*/
2204-
$.timepicker.version = "1.4.6";
2205+
$.timepicker.version = "1.4.7";
22052206

22062207
})(jQuery);

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.

0 commit comments

Comments
 (0)