Skip to content

Commit 6424680

Browse files
michaelbishopmichaelbishop
committed
update to 1.4.3
1 parent f25328c commit 6424680

20 files changed

+195
-29
lines changed

‎Gruntfile.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ module.exports = function(grunt) {
77
// Metadata.
88
pkg: grunt.file.readJSON('jquery-ui-timepicker-addon.json'),
99
banner: '/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %> - ' +
10-
'<%= grunt.template.today("yyyy-mm-dd") %>\n' +
10+
//'<%= grunt.template.today("yyyy-mm-dd") %>\n' +
11+
'<%= pkg.modified %>\n' +
1112
'<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
1213
'* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
1314
' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */\n',
@@ -70,7 +71,7 @@ module.exports = function(grunt) {
7071
options: {
7172
variables: {
7273
version: '<%= pkg.version %>',
73-
timestamp: '<%= grunt.template.today("yyyy-mm-dd") %>'
74+
timestamp: '<%= pkg.modified %>'
7475
},
7576
prefix: '@@'
7677
},

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ I recommend getting the eBook [Handling Time](https://sellfy.com/p/8gxZ) as it h
1515
- Include timepicker-addon script located in the `dist` directory.
1616
- now use timepicker with `$('#selector').datetimepicker()` or `$('#selector').timepicker()`.
1717

18+
There is also a [Bower](http://bower.io/) package named `jqueryui-timepicker-addon`. Beware there are other similar package names that point to forks which may not be current.
19+
1820
Contributing Code - Please Read!
1921
--------------------------------
2022
- All code contributions and bug reports are much appreciated.

‎bower.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "jquery-timepicker-addon",
3-
"version": "1.4",
2+
"name": "jqueryui-timepicker-addon",
3+
"version": "1.4.3",
44
"repository": {
55
"type": "git",
66
"url": "git://github.com/trentrichardson/jQuery-Timepicker-Addon.git"

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/* Armenian translation for the jQuery Timepicker Addon */
2+
/* Written by Artavazd Avetisyan artavazda@hotmail.com */
3+
(function($) {
4+
$.timepicker.regional['am'] = {
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+
amNames: ['AM', 'A'],
17+
pmNames: ['PM', 'P'],
18+
isRTL: false
19+
};
20+
$.timepicker.setDefaults($.timepicker.regional['am']);
21+
})(jQuery);

‎dist/i18n/jquery-ui-timepicker-sr-RS.js‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/* Serbian cyrilic translation for the jQuery Timepicker Addon */
2+
/* Written by Vladimir Jelovac */
3+
(function($) {
4+
$.timepicker.regional['sr-RS'] = {
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+
amNames: ['AM', 'A'],
17+
pmNames: ['PM', 'P'],
18+
isRTL: false
19+
};
20+
$.timepicker.setDefaults($.timepicker.regional['sr-RS']);
21+
})(jQuery);

‎dist/i18n/jquery-ui-timepicker-sr-YU.js‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/* Serbian latin translation for the jQuery Timepicker Addon */
2+
/* Written by Vladimir Jelovac */
3+
(function($) {
4+
$.timepicker.regional['sr-YU'] = {
5+
timeOnlyTitle: 'Odaberite vreme',
6+
timeText: 'Vreme',
7+
hourText: 'Sati',
8+
minuteText: 'Minuti',
9+
secondText: 'Sekunde',
10+
millisecText: 'Milisekunde',
11+
microsecText: 'Mikrosekunde',
12+
timezoneText: 'Vremenska zona',
13+
currentText: 'Sada',
14+
closeText: 'Zatvori',
15+
timeFormat: 'HH:mm',
16+
amNames: ['AM', 'A'],
17+
pmNames: ['PM', 'P'],
18+
isRTL: false
19+
};
20+
$.timepicker.setDefaults($.timepicker.regional['sr-YU']);
21+
})(jQuery);

‎dist/index.html‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ <h4>Handling Time eBook</h4>
8787
<a href="http://trentrichardson.com/ebooks/handling-time/" title="Handling Time eBook"><img src="http://trentrichardson.com/wp-content/uploads/2013/04/time-book-titlepage.jpg" alt="Handling Time eBook" style="float:left;width:100px;margin:0 15px 15px 0;" /></a>
8888
<p class="buyp"><a href="https://sellfy.com/p/8gxZ" id="8gxZ" class="sellfy-buy-button">buy</a> eBook + Example code</p>
8989
<p class="buyp"><a href="https://sellfy.com/p/LvAG" id="LvAG" class="sellfy-buy-button">buy</a> eBook</p>
90-
<p class="buyp"><a href="http://gum.co/ZWYO" class="gumroad-button">Handling Time</a></p>
9190
<div class="clear"></div>
9291
</div>
9392

@@ -125,9 +124,9 @@ <h3>Requirements</h3>
125124

126125
<br />
127126
<h3>Version</h3>
128-
<p>Version 1.4</p>
127+
<p>Version 1.4.3</p>
129128

130-
<p>Last updated on 2013-08-11</p>
129+
<p>Last updated on 2013-11-30</p>
131130
<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under the MIT license.</p>
132131
<p><a href="http://trentrichardson.com/Impromptu/MIT-LICENSE.txt" title="MIT License">MIT License</a></p>
133132

@@ -444,7 +443,7 @@ <h2>Working with Localizations</h2>
444443
hourText: 'Часы',
445444
minuteText: 'Минуты',
446445
secondText: 'Секунды',
447-
currentText: 'Теперь',
446+
currentText: 'Сейчас',
448447
closeText: 'Закрыть'
449448
});
450449
</pre>
@@ -958,7 +957,6 @@ <h3 id="utility_examples">Utilities</h3>
958957
</script>
959958

960959
<script type="text/javascript" src="https://sellfy.com/js/api_buttons.js"></script>
961-
<script type="text/javascript" src="https://gumroad.com/js/gumroad.js"></script>
962960

963961
<script type="text/javascript"> /*
964962
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

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

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

@@ -743,13 +743,23 @@
743743
if (microsec !== false) {
744744
microsec = parseInt(microsec, 10);
745745
}
746+
if (timezone !== false) {
747+
timezone = timezone.toString();
748+
}
746749

747750
var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
748751

749752
// If the update was done in the input field, the input field should not be updated.
750753
// If the update was done using the sliders, update the input field.
751-
var hasChanged = (hour !== this.hour || minute !== this.minute || second !== this.second || millisec !== this.millisec || microsec !== this.microsec ||
752-
(this.ampm.length > 0 && (hour < 12) !== ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) || (this.timezone !== null && timezone !== this.timezone));
754+
var hasChanged = (
755+
hour !== parseInt(this.hour,10) || // sliders should all be numeric
756+
minute !== parseInt(this.minute,10) ||
757+
second !== parseInt(this.second,10) ||
758+
millisec !== parseInt(this.millisec,10) ||
759+
microsec !== parseInt(this.microsec,10) ||
760+
(this.ampm.length > 0 && (hour < 12) !== ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) ||
761+
(this.timezone !== null && timezone !== this.timezone.toString()) // could be numeric or "EST" format, so use toString()
762+
);
753763

754764
if (hasChanged) {
755765

@@ -796,6 +806,7 @@
796806
this.timeDefined = true;
797807
if (hasChanged) {
798808
this._updateDateTime();
809+
this.$input.focus();
799810
}
800811
},
801812

@@ -829,7 +840,7 @@
829840
var formattedDateTime = this.formattedDate;
830841

831842
// if a slider was changed but datepicker doesn't have a value yet, set it
832-
if (dp_inst.lastVa === "") {
843+
if (dp_inst.lastVal === "") {
833844
dp_inst.currentYear = dp_inst.selectedYear;
834845
dp_inst.currentMonth = dp_inst.selectedMonth;
835846
dp_inst.currentDay = dp_inst.selectedDay;
@@ -1594,7 +1605,7 @@
15941605
// object will only return the timezone offset for the current locale, so we
15951606
// adjust it accordingly. If not using timezone option this won't matter..
15961607
// If a timezone is different in tp, keep the timezone as is
1597-
if (tp_inst) {
1608+
if (tp_inst && tp_date) {
15981609
// look out for DST if tz wasn't specified
15991610
if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
16001611
tp_inst.timezone = tp_date.getTimezoneOffset() * -1;
@@ -2129,6 +2140,6 @@
21292140
/*
21302141
* Keep up with the version
21312142
*/
2132-
$.timepicker.version = "1.4";
2143+
$.timepicker.version = "1.4.3";
21332144

21342145
})(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)