From 66252d6ee22832285a1aab3134e31ae6d9f28ab8 Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Wed, 19 Sep 2018 20:09:14 +0900
Subject: [PATCH] =?utf8?q?=E5=A0=B1=E5=91=8A=E6=9B=B8=E3=81=AE=E6=9C=9F?=
 =?utf8?q?=E9=96=93=E6=8C=87=E5=AE=9A=E3=81=A7=E5=85=A5=E5=8A=9B=E6=AC=84?=
 =?utf8?q?=E3=81=AB=E7=9B=B4=E6=8E=A5=E6=97=A5=E4=BB=98=E3=82=92=E5=85=A5?=
 =?utf8?q?=E5=8A=9B=E3=81=99=E3=82=8B=E3=81=A8=E5=8A=B9=E3=81=8B=E3=81=AA?=
 =?utf8?q?=E3=81=84=E3=81=AE=E3=82=92=E7=9B=B4=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 LogViewer/index.html | 22 ++++++++++++++
 LogViewer/tags.tag   | 82 ++++++----------------------------------------------
 2 files changed, 31 insertions(+), 73 deletions(-)

diff --git a/LogViewer/index.html b/LogViewer/index.html
index cd489d1..50e83a8 100644
--- a/LogViewer/index.html
+++ b/LogViewer/index.html
@@ -75,6 +75,28 @@ var mixin = {
             height: Math.max($(window).height() - 15 * this.pxPerEm, 400),
             width: Math.max($(window).width() - 6 * this.pxPerEm, 800)
         };
+    },
+    initPicker: function(from, to, updatePicker) {
+        [$(from), $(to)].forEach(function(input) {
+            var prev, ignore;
+            input.datetimepicker({
+                onSelectDate: function() {
+                    ignore = true;
+                }
+            });
+            input.change(function() {
+                if (ignore) {
+                    ignore = false;
+                    return;
+                }
+                var cur = input.val();
+                if (typeof cur !== 'string' || cur === prev)
+                    return;
+                prev = cur;
+                input.datetimepicker({value: cur});
+                updatePicker(input);
+            });
+        });
     }
 };
 
diff --git a/LogViewer/tags.tag b/LogViewer/tags.tag
index 7d1077c..e8e01f0 100644
--- a/LogViewer/tags.tag
+++ b/LogViewer/tags.tag
@@ -51,29 +51,9 @@ var val = sessionStorage.getItem('logRange');
 opts.logRange.val = val === null ? 2 : +val;
 
 this.init = function() {
-    $('#term_from').datetimepicker({
-        onShow: function() {
-            self.datetimepickerOpen = true;
-        },
-        onClose: function() {
-            if (!self.datetimepickerOpen)
-                return;
-            self.datetimepickerOpen = false;
-            if (opts.logRange.val === 4)
-                opts.observable.trigger("logRangeChanged");
-        }
-    });
-    $('#term_to').datetimepicker({
-        onShow: function() {
-            self.datetimepickerOpen = true;
-        },
-        onClose: function() {
-            if (!self.datetimepickerOpen)
-                return;
-            self.datetimepickerOpen = false;
-            if (opts.logRange.val === 4)
-                opts.observable.trigger("logRangeChanged");
-        }
+    self.initPicker('#term_from', '#term_to', function() {
+        if (opts.logRange.val === 4)
+            opts.observable.trigger( "logRangeChanged");
     });
 };
 
@@ -306,29 +286,9 @@ this.useDatePicker = function() {
 var self = this;
 
 this.init = function() {
-    $('#chart_from').datetimepicker({
-        onShow: function() {
-            self.datetimepickerOpen = true;
-        },
-        onClose: function() {
-            if (!self.datetimepickerOpen)
-                return;
-            self.datetimepickerOpen = false;
-            if (self.useDatePicker())
-                opts.observable.trigger("chartSpecChanged");
-        }
-    });
-    $('#chart_to').datetimepicker({
-        onShow: function() {
-            self.datetimepickerOpen = true;
-        },
-        onClose: function() {
-            if (!self.datetimepickerOpen)
-                return;
-            self.datetimepickerOpen = false;
-            if (self.useDatePicker())
-                opts.observable.trigger("chartSpecChanged");
-        }
+    self.initPicker('#chart_from', '#chart_to', function() {
+        if (self.useDatePicker())
+            opts.observable.trigger("chartSpecChanged");
     });
 };
 
@@ -1149,33 +1109,9 @@ opts.observable.on("mainTabChanged", function(idx) {
 });
 
 this.init = function() {
-    this.initDatePicker();
-};
-
-this.initDatePicker = function() {
-    $('#sortie_stat_from').datetimepicker({
-        onShow: function() {
-            self.datetimepickerOpen = true;
-        },
-        onClose: function() {
-            if (!self.datetimepickerOpen)
-                return;
-            self.datetimepickerOpen = false;
-            if (self.type === "range")
-                self.show();
-        }
-    });
-    $('#sortie_stat_to').datetimepicker({
-        onShow: function() {
-            self.datetimepickerOpen = true;
-        },
-        onClose: function() {
-            if (!self.datetimepickerOpen)
-                return;
-            self.datetimepickerOpen = false;
-            if (self.type === "range")
-                self.show();
-        }
+    self.initPicker('#sortie_stat_from', '#sortie_stat_to', function() {
+        if (self.type === "range")
+            self.show();
     });
 };
 
-- 
2.11.0