Update timer.js: add listener for #commit_top button

js/etersoft/timer.js

@@ -98,6 +98,7 @@ function isworker() {
 }
 
 window.addEventListener("load", function() {
+
   function getTimespentValue() {
     let timespent = document.querySelector("#timespent").value;
     let timespentValue = timespent.split(":");
@@ -113,17 +114,14 @@ window.addEventListener("load", function() {
   }
 
   // add listener for comment commit
-  //let commitBtn = document.querySelector("#commit");
   let openButton = document.querySelector("#commit");
-  let closeButton = document.querySelector("#timeQuestionDiv .close");
+  let closeButton = document.querySelectorAll("#timeQuestionDiv .close");
   let dialog = document.querySelector("#timeQuestionDiv");
 
   openButton.addEventListener("click", function(event) {
     // cancel form submiting
     event.preventDefault();
 
-    document.querySelector('html').style.overflow = "hidden";
-
     let timespentValue = getTimespentValue();
 
     dialog.style.display = "block";
@@ -135,7 +133,22 @@ window.addEventListener("load", function() {
     document.querySelector("#saveTime").dataset["time"] = timespentValue;
   });
 
-  closeButton.addEventListener("click", function () { document.querySelector('html').style.overflow = "auto"; })
+  let openButtonTop = document.querySelector("#commit_top");
+
+  openButtonTop.addEventListener("click", function(event) {
+    // cancel form submiting
+    event.preventDefault();
+
+    let timespentValue = getTimespentValue();
+
+    dialog.style.display = "block";
+    focusManager.capture(dialog);
+
+    // write work time in input value
+    document.querySelector("#realworktime").value =
+      localStorage.time === undefined ? timespentValue : localStorage.time;
+    document.querySelector("#saveTime").dataset["time"] = timespentValue;
+  });
 
   document
     .querySelector("#realworktime")
@@ -170,12 +183,10 @@ window.addEventListener("load", function() {
       workTime === parseInt(btn.dataset["time"])
         ? parseInt(btn.dataset["time"])
         : workTime;
-    workTime = workTime > 0 ? workTime : 0;
-
+    workTime = workTime > 0 ? workTime : 1;
     let workTimeValue = Math.ceil((workTime / 60) * 100) / 100;
-
     let productiveTime = parseInt(document.querySelector("#ProductTime").value);
-    productiveTime = productiveTime > 0 ? productiveTime : workTime;
+    productiveTime = productiveTime > 0 ? productiveTime : 1;
     let productiveTimeValue = Math.ceil((productiveTime / 60) * 100) / 100;
     document.querySelector("#work_time").value = workTimeValue;
     document.querySelector("#productive_time").value = productiveTimeValue;
@@ -242,20 +253,6 @@ document.querySelector("#ProductTime").onpaste = function() {
   validate(event);
 };
 
-document.querySelector("#realworktime").addEventListener("keypress", function(event) {
-  if (event.key === "Enter") {
-    this.blur();
-    document.querySelector("#ProductTime").focus();
-  }
-})
-
-document.querySelector("#ProductTime").addEventListener("keypress", function(event) {
-  if (event.key === "Enter") {
-    this.blur();
-    document.querySelector("#saveTime").click();
-  }
-})
-
 //////////////////////////////////////////////////////////////
 
 if (typeof window.addEventListener != "undefined") {

template/en/default/etersoft/timersplash.html.tmpl

@@ -46,4 +46,4 @@
 
 <script language="javascript" type="text/javascript" src="js/etersoft/focusManager.js"></script>
 <script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js?25_10_2017"></script>
-<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?15_04_2020"></script>
+<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?10_09_2020"></script>

template/ru/default/etersoft/timersplash.html.tmpl

@@ -46,4 +46,4 @@
 
 <script language="javascript" type="text/javascript" src="js/etersoft/focusManager.js"></script>
 <script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js?25_10_2017"></script>
-<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?15_04_2020"></script>
+<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?10_09_2020"></script>