Skip to content

Commit 95d3ec3

Browse files
trentrichardsontrentrichardson
committed
Merge branch 'dev'
2 parents ecc41f9 + f2b80be commit 95d3ec3

17 files changed

+257
-47
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Rails with Bower
2323
-----------------
2424
If you happen to use Rails with the [bower](gem "bower-rails", "~> 0.8.3") gem, here it is to use it easily :
2525
#### Bowerfile
26-
```asset "jqueryui-timepicker-addon", "1.5.4"```
26+
```asset "jqueryui-timepicker-addon", "1.5.6"```
2727

2828
#### application.js
2929
```javascript

‎bower.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"name": "jqueryui-timepicker-addon",
3-
"version": "1.5.5",
43
"repository": {
54
"type": "git",
65
"url": "git://github.com/trentrichardson/jQuery-Timepicker-Addon.git"
76
},
87
"main": ["dist/jquery-ui-timepicker-addon.js", "dist/jquery-ui-timepicker-addon.css"],
8+
"ignore": [
9+
],
910
"dependencies": {
1011
}
1112
}

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

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

@@ -534,6 +534,28 @@
534534
isRTL: false
535535
};
536536

537+
// source: src/i18n/jquery-ui-timepicker-mk.js
538+
/* Macedonian cyrilic translation for the jQuery Timepicker Addon */
539+
/* Written by Vlatko Ristovski */
540+
541+
$.timepicker.regional['mk'] = {
542+
timeOnlyTitle: 'Одберете време',
543+
timeText: 'Време',
544+
hourText: 'Час',
545+
minuteText: 'Минути',
546+
secondText: 'Секунди',
547+
millisecText: 'Милисекунди',
548+
microsecText: 'Микросекунди',
549+
timezoneText: 'Временска зона',
550+
currentText: 'Сега',
551+
closeText: 'Затвори',
552+
timeFormat: 'HH:mm',
553+
timeSuffix: '',
554+
amNames: ['AM', 'A'],
555+
pmNames: ['PM', 'P'],
556+
isRTL: false
557+
};
558+
537559
// source: src/i18n/jquery-ui-timepicker-nl.js
538560
/* Dutch translation for the jQuery Timepicker Addon */
539561
/* Written by Martijn van der Lee */

‎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: 41 additions & 6 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.5</p>
116+
<p>Version 1.5.6</p>
117117

118-
<p>Last updated on 2015-05-24</p>
118+
<p>Last updated on 2015-11-14</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

@@ -325,7 +325,10 @@ <h3>Other Options</h3>
325325
<dl class="defs">
326326
<dt>showButtonPanel</dt>
327327
<dd><em>Default: true</em> - Whether to show the button panel at the bottom. This is generally needed.</dd>
328-
328+
329+
<dt>timeInput</dt>
330+
<dd><em>Default: false</em> - Allows direct input in time field</dd>
331+
329332
<dt>timeOnly</dt>
330333
<dd><em>Default: false</em> - Hide the datepicker and only provide a time interface.</dd>
331334

@@ -517,6 +520,7 @@ <h2>Examples</h2>
517520
<li><a href="#timezone_examples" title="Using Timezones">Using Timezones</a></li>
518521
<li><a href="#slider_examples" title="Slider Modifications">Slider Modifications</a></li>
519522
<li><a href="#alt_examples" title="Alternate Field">Alternate Fields</a></li>
523+
<li><a href="#input_examples" title="Time Input">Time Input</a></li>
520524
<li><a href="#rest_examples" title="Time Restraints">Time Restraints</a></li>
521525
<li><a href="#range_examples" title="Time Ranges">Time Ranges</a></li>
522526
<li><a href="#utility_examples" title="Utilities">Utilities</a></li>
@@ -795,7 +799,7 @@ <h3 id="alt_examples">Alternate Fields</h3>
795799
});
796800
</pre>
797801
</div>
798-
802+
799803
<!-- ============= example -->
800804
<div class="example-container">
801805
<p>With inline mode using altField:</p>
@@ -808,6 +812,38 @@ <h3 id="alt_examples">Alternate Fields</h3>
808812
altField: "#alt_example_4_alt",
809813
altFieldTimeOnly: false
810814
});
815+
</pre>
816+
</div>
817+
818+
<h3 id="input_examples">Time Input</h3>
819+
820+
<!-- ============= example -->
821+
<div class="example-container">
822+
<p>Allows time displayed inside the picker to allow being typed in.</p>
823+
<div>
824+
<input type="text" name="input_example_1" id="input_example_1" value="08/20/2014 01:22 pm" />
825+
</div>
826+
<pre>
827+
$('#input_example_1').datetimepicker({
828+
timeInput: true,
829+
timeFormat: "hh:mm tt"
830+
});
831+
</pre>
832+
</div>
833+
834+
<!-- ============= example -->
835+
<div class="example-container">
836+
<p>Don't show any sliders, only the time input.</p>
837+
<div>
838+
<input type="text" name="input_example_1" id="input_example_2" value="08/20/2014 01:22 pm" />
839+
</div>
840+
<pre>
841+
$('#input_example_2').datetimepicker({
842+
timeInput: true,
843+
timeFormat: "hh:mm tt",
844+
showHour: false,
845+
showMinute: false
846+
});
811847
</pre>
812848
</div>
813849

@@ -1049,9 +1085,8 @@ <h3 id="utility_examples">Utilities</h3>
10491085
$.datepicker.parseTime('HH:mm:ss:l z', "14:36:21:765 +2000", {})
10501086
));
10511087
</pre>
1052-
</div>
1053-
10541088
</div>
1089+
10551090
</div>
10561091

10571092

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
77
.ui-timepicker-div .ui_tpicker_unit_hide{ display: none; }
88

9+
.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input { background: none; color: inherit; border: none; outline: none; border-bottom: solid 1px #555; width: 95%; }
10+
.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input:focus { border-bottom-color: #aaa; }
11+
912
.ui-timepicker-rtl{ direction: rtl; }
1013
.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; }
1114
.ui-timepicker-rtl dl dt{ float: right; clear: right; }

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

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
/*! jQuery Timepicker Addon - v1.5.5 - 2015-05-24
1+
/*! jQuery Timepicker Addon - v1.5.6 - 2015-11-14
22
* http://trentrichardson.com/examples/timepicker
33
* Copyright (c) 2015 Trent Richardson; Licensed MIT */
44
(function (factory) {
55
if (typeof define === 'function' && define.amd) {
6-
define(['jquery', 'jquery.ui'], factory);
6+
define(['jquery', 'jquery-ui'], factory);
77
} else {
88
factory(jQuery);
99
}
@@ -22,7 +22,7 @@
2222
*/
2323
$.extend($.ui, {
2424
timepicker: {
25-
version: "1.5.5"
25+
version: "1.5.6"
2626
}
2727
});
2828

@@ -387,7 +387,7 @@
387387
if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) {
388388
var noDisplay = ' ui_tpicker_unit_hide',
389389
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>' +
390-
'<dd class="ui_tpicker_time '+ ((o.showTime) ? '' : noDisplay) + '"></dd>';
390+
'<dd class="ui_tpicker_time '+ ((o.showTime) ? '' : noDisplay) + '"><input class="ui_tpicker_time_input" ' + (o.timeInput ? '' : 'disabled') + '/></dd>';
391391

392392
// Create the markup
393393
for (i = 0, l = this.units.length; i < l; i++) {
@@ -524,7 +524,21 @@
524524
$dp.append($tp);
525525
}
526526

527-
this.$timeObj = $tp.find('.ui_tpicker_time');
527+
this.$timeObj = $tp.find('.ui_tpicker_time_input');
528+
this.$timeObj.change(function () {
529+
var timeFormat = tp_inst.inst.settings.timeFormat;
530+
var parsedTime = $.datepicker.parseTime(timeFormat, this.value);
531+
var update = new Date();
532+
if (parsedTime) {
533+
update.setHours(parsedTime.hour);
534+
update.setMinutes(parsedTime.minute);
535+
update.setSeconds(parsedTime.second);
536+
$.datepicker._setTime(tp_inst.inst, update);
537+
} else {
538+
this.value = tp_inst.formattedTime;
539+
this.blur();
540+
}
541+
});
528542

529543
if (this.inst !== null) {
530544
var timeDefined = this.timeDefined;
@@ -862,12 +876,15 @@
862876
// Updates the time within the timepicker
863877
this.formattedTime = $.datepicker.formatTime(o.timeFormat, this, o);
864878
if (this.$timeObj) {
879+
var sPos = this.$timeObj[0].selectionStart;
880+
var ePos = this.$timeObj[0].selectionEnd;
865881
if (pickerTimeFormat === o.timeFormat) {
866-
this.$timeObj.text(this.formattedTime + pickerTimeSuffix);
882+
this.$timeObj.val(this.formattedTime + pickerTimeSuffix);
867883
}
868884
else {
869-
this.$timeObj.text($.datepicker.formatTime(pickerTimeFormat, this, o) + pickerTimeSuffix);
885+
this.$timeObj.val($.datepicker.formatTime(pickerTimeFormat, this, o) + pickerTimeSuffix);
870886
}
887+
this.$timeObj[0].setSelectionRange(sPos, ePos);
871888
}
872889

873890
this.timeDefined = true;
@@ -1542,18 +1559,19 @@
15421559
};
15431560

15441561
/*
1545-
* override "Today" button to also grab the time.
1562+
* override "Today" button to also grab the time and set it to input field.
15461563
*/
15471564
$.datepicker._base_gotoToday = $.datepicker._gotoToday;
15481565
$.datepicker._gotoToday = function (id) {
1549-
var inst = this._getInst($(id)[0]),
1550-
$dp = inst.dpDiv;
1566+
var inst = this._getInst($(id)[0]);
1567+
this._base_gotoToday(id);
15511568
var tp_inst = this._get(inst, 'timepicker');
1552-
selectLocalTimezone(tp_inst);
1569+
var tzoffset = $.timepicker.timezoneOffsetNumber(tp_inst.timezone);
15531570
var now = new Date();
1571+
now.setMinutes(now.getMinutes() + now.getTimezoneOffset() + tzoffset);
15541572
this._setTime(inst, now);
15551573
this._setDate(inst, now);
1556-
this._base_gotoToday(id);
1574+
tp_inst._onSelectHandler();
15571575
};
15581576

15591577
/*
@@ -2240,6 +2258,6 @@
22402258
/*
22412259
* Keep up with the version
22422260
*/
2243-
$.timepicker.version = "1.5.5";
2261+
$.timepicker.version = "1.5.6";
22442262

22452263
}));

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

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/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.5",
6-
"modified": "2015-05-24",
5+
"version": "1.5.6",
6+
"modified": "2015-11-14",
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
@@ -1,6 +1,6 @@
11
{
22
"name": "jquery-ui-timepicker-addon",
3-
"version": "1.5.5",
3+
"version": "1.6.0",
44
"engines": {
55
"node": ">= 0.8.0"
66
},

‎src/docs/examples.html

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ <h2>Examples</h2>
99
<li><a href="#timezone_examples" title="Using Timezones">Using Timezones</a></li>
1010
<li><a href="#slider_examples" title="Slider Modifications">Slider Modifications</a></li>
1111
<li><a href="#alt_examples" title="Alternate Field">Alternate Fields</a></li>
12+
<li><a href="#input_examples" title="Time Input">Time Input</a></li>
1213
<li><a href="#rest_examples" title="Time Restraints">Time Restraints</a></li>
1314
<li><a href="#range_examples" title="Time Ranges">Time Ranges</a></li>
1415
<li><a href="#utility_examples" title="Utilities">Utilities</a></li>
@@ -287,7 +288,7 @@ <h3 id="alt_examples">Alternate Fields</h3>
287288
});
288289
</pre>
289290
</div>
290-
291+
291292
<!-- ============= example -->
292293
<div class="example-container">
293294
<p>With inline mode using altField:</p>
@@ -300,6 +301,38 @@ <h3 id="alt_examples">Alternate Fields</h3>
300301
altField: "#alt_example_4_alt",
301302
altFieldTimeOnly: false
302303
});
304+
</pre>
305+
</div>
306+
307+
<h3 id="input_examples">Time Input</h3>
308+
309+
<!-- ============= example -->
310+
<div class="example-container">
311+
<p>Allows time displayed inside the picker to allow being typed in.</p>
312+
<div>
313+
<input type="text" name="input_example_1" id="input_example_1" value="08/20/2014 01:22 pm" />
314+
</div>
315+
<pre>
316+
$('#input_example_1').datetimepicker({
317+
timeInput: true,
318+
timeFormat: "hh:mm tt"
319+
});
320+
</pre>
321+
</div>
322+
323+
<!-- ============= example -->
324+
<div class="example-container">
325+
<p>Don't show any sliders, only the time input.</p>
326+
<div>
327+
<input type="text" name="input_example_1" id="input_example_2" value="08/20/2014 01:22 pm" />
328+
</div>
329+
<pre>
330+
$('#input_example_2').datetimepicker({
331+
timeInput: true,
332+
timeFormat: "hh:mm tt",
333+
showHour: false,
334+
showMinute: false
335+
});
303336
</pre>
304337
</div>
305338

@@ -541,6 +574,4 @@ <h3 id="utility_examples">Utilities</h3>
541574
$.datepicker.parseTime('HH:mm:ss:l z', "14:36:21:765 +2000", {})
542575
));
543576
</pre>
544-
</div>
545-
546-
</div>
577+
</div>

‎src/docs/options.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,10 @@ <h3>Other Options</h3>
202202
<dl class="defs">
203203
<dt>showButtonPanel</dt>
204204
<dd><em>Default: true</em> - Whether to show the button panel at the bottom. This is generally needed.</dd>
205-
205+
206+
<dt>timeInput</dt>
207+
<dd><em>Default: false</em> - Allows direct input in time field</dd>
208+
206209
<dt>timeOnly</dt>
207210
<dd><em>Default: false</em> - Hide the datepicker and only provide a time interface.</dd>
208211

‎src/i18n/jquery-ui-timepicker-mk.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/* Macedonian cyrilic translation for the jQuery Timepicker Addon */
2+
/* Written by Vlatko Ristovski */
3+
(function($) {
4+
$.timepicker.regional['mk'] = {
5+
timeOnlyTitle: 'Одберете време',
6+
timeText: 'Време',
7+
hourText: 'Час',
8+
minuteText: 'Минути',
9+
secondText: 'Секунди',
10+
millisecText: 'Милисекунди',
11+
microsecText: 'Микросекунди',
12+
timezoneText: 'Временска зона',
13+
currentText: 'Сега',
14+
closeText: 'Затвори',
15+
timeFormat: 'HH:mm',
16+
timeSuffix: '',
17+
amNames: ['AM', 'A'],
18+
pmNames: ['PM', 'P'],
19+
isRTL: false
20+
};
21+
$.timepicker.setDefaults($.timepicker.regional['mk']);
22+
})(jQuery);

0 commit comments

Comments
 (0)