[geeklog-hg] geeklog: Merged with upstream

[geeklog-cvs at lists.geeklog.net]

changeset 9521:1ec8788f33ba
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/1ec8788f33ba
user: Kenji ITO <mystralkk at gmail.com>
date: Fri Mar 21 20:19:24 2014 +0900
description:
Merged with upstream

diffstat:

 public_html/javascript/datetimepicker.js |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r 90523271f410 -r 1ec8788f33ba public_html/javascript/datetimepicker.js
--- a/public_html/javascript/datetimepicker.js	Fri Mar 21 20:18:32 2014 +0900
+++ b/public_html/javascript/datetimepicker.js	Fri Mar 21 20:19:24 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);
             }
         });