[geeklog-hg] geeklog: Fixed a bug where timepicker fails to get AM or PM with...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sat Mar 15 08:32:51 EDT 2014
changeset 9519:dfdf68648099
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/dfdf68648099
user: dengen <taharaxp at gmail.com>
date: Sat Mar 15 21:31:59 2014 +0900
description:
Fixed a bug where timepicker fails to get AM or PM with several languages
diffstat:
public_html/javascript/datetimepicker.js | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diffs (25 lines):
diff -r 9f47c05723e7 -r dfdf68648099 public_html/javascript/datetimepicker.js
--- a/public_html/javascript/datetimepicker.js Tue Mar 11 17:47:40 2014 -0400
+++ b/public_html/javascript/datetimepicker.js Sat Mar 15 21:31:59 2014 +0900
@@ -136,7 +136,7 @@
* @return (void)
*/
set: function (selectorName, langCode, toolTip, imgUrl) {
- var $ = jQuery, inputId, dt;
+ var $ = jQuery, inputId, dt, tt;
// Checks parameters
if (!selectorName) {
@@ -186,7 +186,11 @@
$("select[name='" + selectorName + "_hour']").val(dt.substr(11, 2));
$("select[name='" + selectorName + "_minute']").val(dt.substr(14, 2));
if (geeklog.hour_mode == 12) {
- $("select[name='" + selectorName + "_ampm']").val(dt.substr(17, 2));
+ tt = dt.substr(17);
+ if (tt != 'am' && tt != 'pm') {
+ tt = ($.inArray(tt, $.timepicker._defaults.amNames) == -1) ? 'pm' : 'am';
+ }
+ $("select[name='" + selectorName + "_ampm']").val(tt);
}
});
More information about the geeklog-cvs
mailing list