[etersoft] Cherry-pick 222af203

js/etersoft/timer.js

@@ -921,6 +921,7 @@ window.addEventListener("load", function() {
     document.querySelector("#saveTime").dataset["time"] = timespentValue;
   });
 
+<<<<<<< HEAD
   let openButtonTop = document.getElementById("commit_top");
 
   if (openButtonTop) {
@@ -941,6 +942,24 @@ window.addEventListener("load", function() {
     });
 
   }
+=======
+  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;
+  });
+>>>>>>> 222af2032 (Update timer.js: add listener for #commit_top button)
 
   document
     .querySelector("#realworktime")
@@ -975,6 +994,7 @@ window.addEventListener("load", function() {
       workTime === parseInt(btn.dataset["time"])
         ? parseInt(btn.dataset["time"])
         : workTime;
+<<<<<<< HEAD
     workTime = workTime > 0 ? workTime : 0;
     let workTimeValue = Math.ceil((workTime / 60) * 100) / 100;
     let productiveTime = parseInt(document.querySelector("#ProductTime").value);
@@ -983,6 +1003,12 @@ window.addEventListener("load", function() {
 =======
     productiveTime = productiveTime > 0 ? productiveTime : 0;
 >>>>>>> 10034a1af (Add ability for no comment when workTime is null)
+=======
+    workTime = workTime > 0 ? workTime : 1;
+    let workTimeValue = Math.ceil((workTime / 60) * 100) / 100;
+    let productiveTime = parseInt(document.querySelector("#ProductTime").value);
+    productiveTime = productiveTime > 0 ? productiveTime : 1;
+>>>>>>> 222af2032 (Update timer.js: add listener for #commit_top button)
     let productiveTimeValue = Math.ceil((productiveTime / 60) * 100) / 100;
     document.querySelector("#work_time").value = workTimeValue;
     document.querySelector("#productive_time").value = productiveTimeValue;

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

@@ -56,6 +56,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script>
 =======
 <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script>
@@ -87,3 +88,6 @@
 =======
 <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020"></script>
 >>>>>>> 3f52e29c4 (Fix bug creating)
+=======
+<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?10_09_2020"></script>
+>>>>>>> 222af2032 (Update timer.js: add listener for #commit_top button)

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

@@ -56,6 +56,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script>
 =======
 <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script>
@@ -87,3 +88,6 @@
 =======
 <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020"></script>
 >>>>>>> 3f52e29c4 (Fix bug creating)
+=======
+<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?10_09_2020"></script>
+>>>>>>> 222af2032 (Update timer.js: add listener for #commit_top button)