diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2015-02-10 08:37:59 -0500 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2015-02-10 08:37:59 -0500 |
| commit | df9b22e11e91dd3604b6a4daad79802acc54a91e (patch) | |
| tree | 75fdd6829b84b596a773b84aa8efbb0dd5231c0e /dist/jquery-ui-timepicker-addon.js | |
| parent | a31d56d6c92a2cba27e4021dfc9bdbcac78baea2 (diff) | |
| download | jQuery-Timepicker-Addon-df9b22e11e91dd3604b6a4daad79802acc54a91e.zip jQuery-Timepicker-Addon-df9b22e11e91dd3604b6a4daad79802acc54a91e.tar.gz jQuery-Timepicker-Addon-df9b22e11e91dd3604b6a4daad79802acc54a91e.tar.bz2 | |
Pull #779 - Fix issues with handling upper/lower case am/pm names
Diffstat (limited to 'dist/jquery-ui-timepicker-addon.js')
| -rw-r--r-- | dist/jquery-ui-timepicker-addon.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dist/jquery-ui-timepicker-addon.js b/dist/jquery-ui-timepicker-addon.js index 09eb92a..70c9dcb 100644 --- a/dist/jquery-ui-timepicker-addon.js +++ b/dist/jquery-ui-timepicker-addon.js @@ -1,6 +1,6 @@ /*! jQuery Timepicker Addon - v1.5.1 - 2014-09-01 * http://trentrichardson.com/examples/timepicker -* Copyright (c) 2014 Trent Richardson; Licensed MIT */ +* Copyright (c) 2015 Trent Richardson; Licensed MIT */ (function ($) { /* @@ -1065,7 +1065,7 @@ o[opts] = val; } else { o = opts; } - 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')); + 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')); }, value: function (tp_inst, obj, unit, val) { var $t = obj.children('select'); @@ -1229,7 +1229,7 @@ ampm = ''; resTime.ampm = ''; } else { - ampm = $.inArray(treg[order.t].toUpperCase(), o.amNames) !== -1 ? 'AM' : 'PM'; + ampm = $.inArray(treg[order.t].toUpperCase(), $.map(o.amNames, function (x,i) { return x.toUpperCase(); })) !== -1 ? 'AM' : 'PM'; resTime.ampm = o[ampm === 'AM' ? 'amNames' : 'pmNames'][0]; } } |