summaryrefslogtreecommitdiffstats
path: root/src/jquery-ui-timepicker-addon.js
diff options
context:
space:
mode:
authorTrent Richardson <trentdrichardson@gmail.com>2015-02-10 08:37:59 -0500
committerTrent Richardson <trentdrichardson@gmail.com>2015-02-10 08:37:59 -0500
commitdf9b22e11e91dd3604b6a4daad79802acc54a91e (patch)
tree75fdd6829b84b596a773b84aa8efbb0dd5231c0e /src/jquery-ui-timepicker-addon.js
parenta31d56d6c92a2cba27e4021dfc9bdbcac78baea2 (diff)
downloadjQuery-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 'src/jquery-ui-timepicker-addon.js')
-rw-r--r--src/jquery-ui-timepicker-addon.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js
index 1c00dc7..81a0fe3 100644
--- a/src/jquery-ui-timepicker-addon.js
+++ b/src/jquery-ui-timepicker-addon.js
@@ -1235,7 +1235,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];
}
}