Skip to content

Commit df9b22e

Browse files
Pull trentrichardson#779 - Fix issues with handling upper/lower case am/pm names
1 parent a31d56d commit df9b22e

6 files changed

+9
-9
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*! jQuery Timepicker Addon - v1.5.1 - 2014-09-01
22
* http://trentrichardson.com/examples/timepicker
3-
* Copyright (c) 2014 Trent Richardson; Licensed MIT */
3+
* Copyright (c) 2015 Trent Richardson; Licensed MIT */
44

55
(function($){
66

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

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery-ui-timepicker-addon.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*! jQuery Timepicker Addon - v1.5.1 - 2014-09-01
22
* http://trentrichardson.com/examples/timepicker
3-
* Copyright (c) 2014 Trent Richardson; Licensed MIT */
3+
* Copyright (c) 2015 Trent Richardson; Licensed MIT */
44
(function ($) {
55

66
/*
@@ -1065,7 +1065,7 @@
10651065
o[opts] = val;
10661066
}
10671067
else { o = opts; }
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'));
1068+
return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min>=0 ? o.min : $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step'));
10691069
},
10701070
value: function (tp_inst, obj, unit, val) {
10711071
var $t = obj.children('select');
@@ -1229,7 +1229,7 @@
12291229
ampm = '';
12301230
resTime.ampm = '';
12311231
} else {
1232-
ampm = $.inArray(treg[order.t].toUpperCase(), o.amNames) !== -1 ? 'AM' : 'PM';
1232+
ampm = $.inArray(treg[order.t].toUpperCase(), $.map(o.amNames, function (x,i) { return x.toUpperCase(); })) !== -1 ? 'AM' : 'PM';
12331233
resTime.ampm = o[ampm === 'AM' ? 'amNames' : 'pmNames'][0];
12341234
}
12351235
}

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

+1-1
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

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/jquery-ui-timepicker-addon.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1235,7 +1235,7 @@
12351235
ampm = '';
12361236
resTime.ampm = '';
12371237
} else {
1238-
ampm = $.inArray(treg[order.t].toUpperCase(), o.amNames) !== -1 ? 'AM' : 'PM';
1238+
ampm = $.inArray(treg[order.t].toUpperCase(), $.map(o.amNames, function (x,i) { return x.toUpperCase(); })) !== -1 ? 'AM' : 'PM';
12391239
resTime.ampm = o[ampm === 'AM' ? 'amNames' : 'pmNames'][0];
12401240
}
12411241
}

0 commit comments

Comments
 (0)