Show some love to our photophobic users.

(Always use dark theme if the user indicates their preference.)
Blog posts will be updated later.

2 files changed, 4 insertions, 40 deletions

diff --git a/libs/music/player b/libs/music/player
index ba4469d..6f5b4d8 100644
--- a/libs/music/player
+++ b/libs/music/player
@@ -19,44 +19,7 @@
 	<link rel=stylesheet href="/libs/music/player.d/styles.css" type="text/css">
 	<script type="text/javascript" src="/libs/music/player.d/main_static.js"></script>
 	<script type="text/javascript" src="/panel.js"></script>
-	<script type="text/javascript">
-		var athm;
-		function loadTheme(){
-			var thm=document.cookie.replace(new RegExp("(?:(?:^|.*;\\s*)thm\\s*\\=\\s*([^;]*).*$)|^.*$"),"$1");
-			if(thm.length<2||'0123z'.indexOf(thm[0])==-1||'abz'.indexOf(thm[1])==-1)thm='zz';
-			var ent="";
-			var d=new Date();
-			if(thm[0]=='z')
-			{
-				var m=d.getMonth()+1;
-				if(m>=3&&m<6)thm='0'+thm[1];
-				else if(m>=6&&m<9)thm='1'+thm[1];
-				else if(m>=9&&m<12)thm='2'+thm[1];
-				else thm='3'+thm[1];
-			}
-			if(thm[1]=='z')
-			{if(d.getHours()>=18||d.getHours()<6)thm=thm[0]+'b';else thm=thm[0]+'a';}
-			athm=thm[1]=='a'?0:1;
-			ent=`theme${thm}`;
-			var R=new RegExp('theme[0-4][ab]');
-			for(var i=0;i<document.styleSheets.length;++i)
-			{
-				if(R.exec(document.styleSheets[i].ownerNode.id)!==null&&document.styleSheets[i].ownerNode.id!=ent)
-				document.styleSheets[i].disabled=true;
-				else document.styleSheets[i].disabled=false;
-			}
-			var thmcolor="";
-			switch(thm[0])
-			{
-				case '0':thmcolor=thm[1]=='a'?'#f59dda':'#2f0933';break;
-				case '1':thmcolor=thm[1]=='a'?'#9df59d':'#090933';break;
-				case '2':thmcolor=thm[1]=='a'?'#edb47b':'#1f1205';break;
-				case '3':thmcolor=thm[1]=='a'?'#a0cdfa':'#051933';break;
-			}
-			document.querySelector("meta[name=theme-color]").setAttribute('content',thmcolor);
-		}
-		loadTheme();
-	</script>
+	<script type="text/javascript" src="/themer.js"></script>
 </head>
 <!--
 The Stupid Online Player
diff --git a/libs/music/player.d/main_static.js b/libs/music/player.d/main_static.js
index fe30cca..51f7243 100644
--- a/libs/music/player.d/main_static.js
+++ b/libs/music/player.d/main_static.js
@@ -547,7 +547,7 @@ NSVisualization={
             NSAudio.anlznode.getByteTimeDomainData(timedomv);
             cctx.lineWidth=window.devicePixelRatio;
             cctx.strokeStyle='#000';
-            if(athm)cctx.strokeStyle='#FFF';
+            if(isDarkTheme)cctx.strokeStyle='#FFF';
             cctx.beginPath();
             for(let i=0,x=0;i<this.nbins;++i)
             {
@@ -572,7 +572,7 @@ NSVisualization={
             cctx.clearRect(this.spectgrmp/this.spectgrmw*canvas.width,0,canvas.width/this.spectgrmw,canvas.height);
             for(let i=0;i<this.nbins;++i)
             {
-                let color=(athm?'rgba(255,255,255,':'rgba(0,0,0,')+freqdomv[i]/256.+')';
+                let color=(isDarkTheme?'rgba(255,255,255,':'rgba(0,0,0,')+freqdomv[i]/256.+')';
                 cctx.fillStyle=color;
                 cctx.fillRect(this.spectgrmp/this.spectgrmw*canvas.width,(this.nbins-i)/this.nbins*canvas.height,canvas.width/this.spectgrmw,canvas.height/this.nbins);
             }
@@ -693,6 +693,7 @@ NSInk={
 function init()
 {
     if(!window.devicePixelRatio)window.devicePixelRatio=1;
+	loadTheme();
     NSUI.setup_ui();
     NSUI.load_playlists()
     .then(()=>{