made fs update & hmm.opts -> hmm.storage.opts

Electogenius · Nov 27, 2021 · 0072529 · 0072529
1 parent 56b3f62
commit 0072529
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git a/index.html b/index.html
@@ -22,7 +22,9 @@
 		integrity="sha512-dGbVa0XX8dFXCjPsvhYMn1BcgR67hiJsnzClNrc5PoIu7Gp9ZrRaV2dYW2fXcuPAI4xTSK000x9kNmIV1w+Z9Q=="
 		crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 
-		<script src="https://cdnjs.cloudflare.com/ajax/libs/localforage/1.10.0/localforage.min.js" integrity="sha512-+BMamP0e7wn39JGL8nKAZ3yAQT2dL5oaXWr4ZYlTGkKOaoXM/Yj7c4oy50Ngz5yoUutAG17flueD4F6QpTlPng==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/localforage/1.10.0/localforage.min.js"
+		integrity="sha512-+BMamP0e7wn39JGL8nKAZ3yAQT2dL5oaXWr4ZYlTGkKOaoXM/Yj7c4oy50Ngz5yoUutAG17flueD4F6QpTlPng=="
+		crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 </head>
 
 <body>
@@ -68,7 +70,7 @@
 </script>
 
 <script type="text/javascript" src="https://translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>-->
-	<script src="main.js" charset="utf-8" onload="hmm.setup()"></script>
+	<script src="main.js" charset="utf-8"></script>
 	<script src="cmd.js" type="text/javascript" charset="utf-8"></script>
 </body>
 

diff --git a/main.js b/main.js
@@ -22,7 +22,7 @@ window.hmm = {
 	},
 	l: {},
 	t: phrase => {
-		return hmm.l[hmm.opts.lang]?.t(phrase)
+		return hmm.l[hmm.storage.opts.lang]?.t(phrase)
 	}
 }
 hmm.l.en = new Polyglot({
@@ -80,17 +80,20 @@ hmm.storage = {
 			type: "iframe",
 			code: "<script>location = './settings.html'</script>",
 		},
+	},
+	opts:{
+		lang:'en'
 	}
 }
 
 window.onload = () => {
 	localforage.getItem("hmm-fs").then((val) => {
-		console.log(val)
 		if (null !== val) {
 			hmm.storage = val
 		}else{
 			localforage.setItem('hmm-fs',hmm.storage)
 		}
+		hmm.setup()
 	})
 }
 hmm.bar = document.getElementById("bar")
@@ -249,10 +252,10 @@ hmm.App = class {
 }
 setInterval(e => {
 	document.querySelectorAll(".h-time").forEach(e => {
-		e.innerText = new Date().toLocaleTimeString(hmm.opts.lang)
+		e.innerText = new Date().toLocaleTimeString(hmm.storage.opts.lang)
 	})
 	document.querySelectorAll(".h-date").forEach(e => {
-		e.innerText = new Date().toLocaleDateString(hmm.opts.lang) //.toLocaleDateString(hmm.opts.lang)
+		e.innerText = new Date().toLocaleDateString(hmm.storage.opts.lang) //.toLocaleDateString(hmm.storage.opts.lang)
 	})
 }, 1e3)
 hmm.setMenu = () => {
@@ -337,6 +340,9 @@ hmm.setup = () => {
 	if (location.href.startsWith("http://localhost:7700")) {
 		hmm.testcommand()
 	}
+	setInterval(()=>{ //periodically update localforage
+		localforage.setItem('hmm-fs',hmm.storage)
+	},1000)
 }
 //very useful BUT BREAKS CODE FOR SOME REASON:
 //Object.prototype.with=function(k,v){var x=this;x[k]=v;return x}

diff --git a/settings.html b/settings.html
@@ -32,19 +32,19 @@ <h1 data-t="name"></h1>
 <script>
 	let e=q=>document.getElementById(q)
 	if(window.top!==window.self){
-		let w = {}
-		w=window.top.hmm
-		e("lang").value = w.opts.lang
+		let hmm = {}
+		hmm=window.top.hmm
+		e("lang").value = hmm.storage.opts.lang
 		e("lang").onchange =()=>{
-			w.opts.lang = e("lang").value
-			w.setup();t(w)
+			hmm.storage.opts.lang = e("lang").value
+			hmm.setup();t(hmm)
 		}
 		function t(w){
 			document.querySelectorAll("[data-t]").forEach(e=>{
 				e.innerHTML = w.t("apps.settings."+e.getAttribute("data-t"))
 			})
 		}
-		t(w)
+		t(hmm)
 	}else{
 		document.body.innerHTML = "oops"
 	}

diff --git a/style.css b/style.css
@@ -21,17 +21,17 @@
 }
 
 ::-webkit-scrollbar {
-	width: 10px;
+	width: 5px;
 }
 
 ::-webkit-scrollbar-track {
-	-webkit-box-shadow: inset 0 0 1px rgba(255, 255, 255, 1);
-	border-radius: 1px;
+	/* -webkit-box-shadow: inset 0 0 1px rgba(255, 255, 255, 1);
+	border-radius: 5px; */
 }
 
 ::-webkit-scrollbar-thumb {
-	border-radius: 3px;
-	-webkit-box-shadow: inset 0 0 15px #05d;
+	border-radius: 5px;
+	-webkit-box-shadow: inset 0 0 15px #fff;
 }
 
 :root {