updated

RoderickQiu · Jul 5, 2019 · 7ff4469 · 7ff4469
1 parent 25ea7cb
commit 7ff4469
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/index.html b/index.html
@@ -142,6 +142,7 @@
     <script>
         var timecnt, myDate, h, min;
         function sumGet() {
+            console.log('a')
             timecnt = (Number($("#work-time").val()) + Number($("#rest-time").val())) * Number($("#loop").val());
             $("#allsum-num").html(timecnt);
             myDate = new Date();
@@ -169,8 +170,9 @@
             $("#no-use-space").css("display", "none");
         }
         function allSet() {
-            if ((Number($("#work-time").val()) + Number($("#rest-time").val())) * Number($("#loop").val())) sumGet();
-            else {
+            if (Number($("#work-time").val()) != 0 && Number($("#rest-time").val()) != 0 && Number($("#loop").val()) != 0 && String(Number($("#work-time").val())).indexOf('e') == -1 && String(Number($("#rest-time").val())).indexOf('e') == -1 && String(Number($("#loop").val())).indexOf('e') == -1) {
+                if ((Number($("#work-time").val()) + Number($("#rest-time").val())) * Number($("#loop").val())) sumGet();
+            } else {
                 $("#allsum-num").html("---");
                 $("#to-num-h").html("--");
                 $("#to-num-min").html("--");

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "wnr",
   "version": "1.5.1",
-  "description": "It's a timer app with strong expansibility for computers. The name is a abbr of \"Work and Rest\".",
+  "description": "It's a timer app with strong expansibility for computers. The name is an abbr of \"Work and Rest\".",
   "main": "main.js",
   "scripts": {
     "start": "electron .",