瀏覽代碼

formatting and finnish implementation of dateSeperator seperate from clockSeperator

TheBaum123 1 年之前
父節點
當前提交
ee7e1811d9
共有 2 個文件被更改,包括 38 次插入23 次删除
  1. 36 22
      scripts/clock.js
  2. 2 1
      scripts/getPreferences.js

+ 36 - 22
scripts/clock.js

@@ -1,39 +1,53 @@
 //wait for other scripts to load first
 setTimeout(() => {
-    if(clockSeperator == "" || clockSeperator == null) {
-        clockSeperator = "|"
+    if (clockSeperator == "" || clockSeperator == null) {
+        clockSeperator = "|";
     }
-    updateTime()
+    if (dateSeperator == "" || dateSeperator == null) {
+        dateSeperator = "|";
+    }
+    updateTime();
 }, 10);
 
 //update clock every second
 const clockInterval = setInterval(() => {
-    updateTime()
+    updateTime();
 }, 1000);
 
 //function to update the clock
 function updateTime() {
-    let time = new Date()
-    let monthNames =
-    [
-        "January", "February", "March",
-        "April", "May", "June",
-        "July", "August", "September",
-        "October", "November", "December"
-    ]
-    let outputTime = `${twoDigit(time.getHours())} ${clockSeperator} ${twoDigit(time.getMinutes())} ${clockSeperator} ${twoDigit(time.getSeconds())}`
-    let outputDate = `${twoDigit(time.getDate())} ${clockSeperator} ${monthNames[time.getMonth()]} ${clockSeperator} ${time.getFullYear()}`
-    document.getElementById("time-display").innerText = outputTime
-    document.getElementById("date-display").innerText = outputDate
+    let time = new Date();
+    let monthNames = [
+        "January",
+        "February",
+        "March",
+        "April",
+        "May",
+        "June",
+        "July",
+        "August",
+        "September",
+        "October",
+        "November",
+        "December",
+    ];
+    let outputTime = `${twoDigit(time.getHours())} ${clockSeperator} ${twoDigit(
+        time.getMinutes()
+    )} ${clockSeperator} ${twoDigit(time.getSeconds())}`;
+    let outputDate = `${twoDigit(time.getDate())} ${dateSeperator} ${
+        monthNames[time.getMonth()]
+    } ${dateSeperator} ${time.getFullYear()}`;
+    document.getElementById("time-display").innerText = outputTime;
+    document.getElementById("date-display").innerText = outputDate;
 }
 
 //function to prefix single digit numbers with 0 for consistancy
 function twoDigit(num) {
-    fixedNum = 0
-    if(num.toString().length == 1) {
-        fixedNum = `0${num}`
+    fixedNum = 0;
+    if (num.toString().length == 1) {
+        fixedNum = `0${num}`;
     } else {
-        fixedNum = num.toString()
+        fixedNum = num.toString();
     }
-    return(fixedNum)
-}
+    return fixedNum;
+}

+ 2 - 1
scripts/getPreferences.js

@@ -44,8 +44,9 @@ localStorage.getItem("text-startpage:greetingText")
 let greetingName = localStorage.getItem("text-startpage:greetingName");
 
 //clock
-let clockSeperator = localStorage.getItem("text-startpage:clockSeperator");
 let enableClock = localStorage.getItem("text-startpage:enableClock");
+let clockSeperator = localStorage.getItem("text-startpage:clockSeperator");
+let dateSeperator = localStorage.getItem("text-startpage:dateSeperator");
 
 //quote
 let enableQuote = localStorage.getItem("text-startpage:enableQuote");