From ab54c476ea6b3aa306059d2bc161d3e8729502f1 Mon Sep 17 00:00:00 2001 From: dan63047 Date: Fri, 3 Jul 2020 15:53:13 +0300 Subject: [PATCH] Site more interactive --- index.html | 2 +- script.js | 19 +++++++++++++++++-- style.css | 1 + 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 8d255c1..acbab72 100644 --- a/index.html +++ b/index.html @@ -12,7 +12,7 @@

До смерти 32-битных систем осталось

-
+

diff --git a/script.js b/script.js index 58a5512..7732d38 100644 --- a/script.js +++ b/script.js @@ -1,9 +1,20 @@ const maxtimestamp = 2147483647; var readable_timer_mode = 0; +var msec_display = true; function ReadableTimerSwitcher(){ readable_timer_mode++ - if(readable_timer_mode > 1){readable_timer_mode = 0} + if(readable_timer_mode > 2){readable_timer_mode = 0} +} + +function msecDisplaySwitcher(){ + if(msec_display){ + msec_display = false + $("#time-left-msec").css("display", "none"); + }else{ + msec_display = true + $("#time-left-msec").css("display", "unset"); + } } function Cycle() { @@ -15,7 +26,7 @@ function Cycle() { $("#time-left-msec").html("." + ('00' + tmsec).slice(-3)); $("#prog").val(timestamp); $("#timestamp").html(Math.trunc(timestamp).toLocaleString('ru')); - if (left < 60) { $("#time-left-readable").css("display", "none") } + if (left < 60 && readable_timer_mode != 2) { $("#time-left-readable").css("display", "none") } if (left <= 0) { clearInterval(c); $("#time-left").html("0"); @@ -38,6 +49,10 @@ function Cycle() { tyear = Math.floor(left / 60 / 60 / 24 / 365); $("#time-left-readable").html("(" + tyear + " л. " + tday + " дн. " + ("0" + thour).slice(-2) + ":" + ("0" + tmin).slice(-2) + ":" + ("0" + tsec).slice(-2) + ")"); break; + case 2: + var precentage = (timestamp/maxtimestamp)*100; + $("#time-left-readable").html(Math.trunc(timestamp).toLocaleString('ru')+" / "+maxtimestamp.toLocaleString('ru')+" ("+precentage.toFixed(8)+"%)"); + break; } } var c = setInterval(Cycle, 1000 / 60); \ No newline at end of file diff --git a/style.css b/style.css index fc34811..6927488 100644 --- a/style.css +++ b/style.css @@ -8,6 +8,7 @@ body{ } #time-left{ font-size: 10em; + cursor: pointer; } #time-left-readable{ text-align: center;