Don't enable night mode by default, remove night mode listener if unused

Author: ferndot

scripts/night.js

@@ -10,29 +10,39 @@
 ------------------------*/
 var ncss, dcss = document.getElementsByTagName("link")[25];
 var nightTheme = '#111', dayTheme = '#fff';
-var nightChangeEvent = new CustomEvent('night.changed');
+var nightChangeEvent = new CustomEvent('night.changed'), nightListener;
 
 function night() {
-	if (firetext.settings.get('nightmode') == 'true') {
-		startNight(true);
-	} else if (firetext.settings.get('nightmode') == 'false') {
-		startNight(false);
-	} else {
-		startNight(false);
-		
-		window.addEventListener('devicelight', function(event) {
-			if (firetext.settings.get('nightmode') == 'auto') {
-				if (event.value < 3.4) {
-					if (html.classList.contains('night') != true) {
-						startNight(true);
-					}
-				} else if (event.value > 5) {
-					if (html.classList.contains('night')) {
-						startNight(false);
-					}
-				}
+	switch (firetext.settings.get('nightmode')) {
+		case "true":
+			startNight(true);
+			window.removeEventListener('devicelight', processLight);
+			nightListener = false;
+			break;
+		case "false":
+			startNight(false);
+			window.removeEventListener('devicelight', processLight);
+			nightListener = false;
+			break;
+		case "auto":
+			startNight(false);
+			if (!nightListener) window.addEventListener('devicelight', processLight);
+			nightListener = true;
+			break;
+	}
+}
+
+function processLight(event) {
+	if (firetext.settings.get('nightmode') == 'auto') {
+		if (event.value < 3.4) {
+			if (html.classList.contains('night') != true) {
+				startNight(true);
+			}
+		} else if (event.value > 5) {
+			if (html.classList.contains('night')) {
+				startNight(false);
 			}
-		});		 
+		}
 	}
 }
 

scripts/settings.js

@@ -103,14 +103,13 @@ firetext.settings.init = function () {
 	// Night Mode
 	if (firetext.settings.get('nightmode') == 'true') {
 		nightmodeSelect.value = '1';
-	} else if (firetext.settings.get('nightmode') == 'false') { 
-		nightmodeSelect.value = '0';
-	} else {
+	} else if (firetext.settings.get('nightmode') == 'auto') {
 		nightmodeSelect.value = '2';
-		if (firetext.settings.get('nightmode') != 'auto') {
-			firetext.settings.save('nightmode', 'auto');
-			night();
-		} 
+	} else {
+		nightmodeSelect.value = '0';
+		if (firetext.settings.get('nightmode') != 'false') {
+			firetext.settings.save('nightmode', 'false');
+		}
 	}
 	nightmodeSelect.addEventListener('change', function () {
 		// Convert