From bba83ef72749f75a4eb2e2e4d74e9ebaded98c64 Mon Sep 17 00:00:00 2001
From: Azareal <azareal@users.noreply.github.com>
Date: Tue, 10 Mar 2020 07:41:17 +1000
Subject: [PATCH] save bytes

---
 public/account.js                   |  2 +-
 public/init.js                      | 74 +++++++++++------------------
 public/member.js                    |  6 +--
 templates/footer.html               |  2 +-
 themes/cosora/public/misc.js        | 24 +++++-----
 themes/shadow/public/misc.js        |  8 ++--
 themes/tempra_simple/public/misc.js |  8 ++--
 7 files changed, 53 insertions(+), 71 deletions(-)

diff --git a/public/account.js b/public/account.js
index 93e92090..9175d8ca 100644
--- a/public/account.js
+++ b/public/account.js
@@ -6,4 +6,4 @@ addInitHook("end_init", () => {
 		$("#dash_username button").show();
 	});
 });
-})();
\ No newline at end of file
+})()
\ No newline at end of file
diff --git a/public/init.js b/public/init.js
index cc42be63..2e5877c2 100644
--- a/public/init.js
+++ b/public/init.js
@@ -1,26 +1,12 @@
 'use strict';
-
 var me={};
 var phraseBox={};
 if(tmplInits===undefined) var tmplInits={};
 var tmplPhrases=[]; // [key] array of phrases indexed by order of use
-var hooks={ // Shorten this list by binding the hooks just in time?
-	"pre_iffe":[],
-	"pre_init":[],
-	"start_init":[],
-	"almost_end_init":[],
-	"end_init":[],
-	"after_phrases":[],
-	"after_add_alert":[],
-	"after_update_alert_list":[],
-	"open_edit":[],
-	"close_edit":[],
-	"edit_item_pre_bind":[],
-	"analytics_loaded":[],
-};
+var hooks={};
 var ranInitHooks={}
 
-function runHook(name, ...args) {
+function runHook(name,...args) {
 	if(!(name in hooks)) {
 		console.log("Couldn't find hook '" + name + "'");
 		return;
@@ -33,19 +19,19 @@ function runHook(name, ...args) {
 	return ret;
 }
 
-function addHook(name, h) {
-	if(hooks[name]===undefined) hooks[name] = [];
+function addHook(name,h) {
+	if(hooks[name]===undefined) hooks[name]=[];
 	hooks[name].push(h);
 }
 
 // InitHooks are slightly special, as if they are run, then any adds after the initial run will run immediately, this is to deal with the async nature of script loads
-function runInitHook(name, ...args) {
+function runInitHook(name,...args) {
 	let ret = runHook(name,...args);
 	ranInitHooks[name] = true;
 	return ret;
 }
 
-function addInitHook(name, h) {
+function addInitHook(name,h) {
 	addHook(name, h);
 	if(name in ranInitHooks) h();
 }
@@ -78,26 +64,26 @@ function asyncGetScript(src) {
 		script.src = src;
 
 		const prior = document.getElementsByTagName('script')[0];
-		prior.parentNode.insertBefore(script, prior);
+		prior.parentNode.insertBefore(script,prior);
 	});
 }
 
 function notifyOnScript(src) {
 	src = "/s/"+src;
-	return new Promise((resolve, reject) => {
+	return new Promise((resolve,reject) => {
 		let ss = src.replace("/s/","");
 		try {
 			let ssp = ss.charAt(0).toUpperCase() + ss.slice(1)
-			console.log("ssp:",ssp)
+			console.log("ssp",ssp)
 			if(window[ssp]) {
 				resolve();
 				return;
 			}
 		} catch(e) {}
 		
-		console.log("src:",src)
+		console.log("src",src)
 		let script = document.querySelectorAll('[src^="'+src+'"]')[0];
-		console.log("script:",script);
+		console.log("script",script);
 		if(script===undefined) {
 			reject("no script found");
 			return;
@@ -108,7 +94,6 @@ function notifyOnScript(src) {
 			script.onreadystatechange = null;
 			resolve();
 		}
-
 		script.onerror = (e) => {
 			reject(e);
 		};
@@ -123,9 +108,9 @@ function notifyOnScriptW(name,complete,success) {
 			console.log("Loaded " +name+".js");
 			complete();
 			if(success!==undefined) success();
-		}).catch((e) => {
+		}).catch(e => {
 			console.log("Unable to get script name '"+name+"'");
-			console.log("e: ", e);
+			console.log("e", e);
 			console.trace();
 			complete(e);
 		});
@@ -147,29 +132,26 @@ function loadScript(name,callback,fail) {
 			if(fname!=name) {
 				asyncGetScript(iurl)
 					.then(callback)
-					.catch((e) => {
+					.catch(e => {
 						console.log("Unable to get script '"+iurl+"'");
-						console.log("e:", e);
+						console.log("e", e);
 						console.trace();
 					});
 			}
-			console.log("e:", e);
+			console.log("e", e);
 			console.trace();
 			fail(e);
 		});
 }
 
-/*
-function loadTmpl(name,callback) {
+/*function loadTmpl(name,callback) {
 	let url = "/s/"+name
 	let worker = new Worker(url);
-}
-*/
+}*/
 
 function DoNothingButPassBack(it) {
 	return it;
 }
-
 function RelativeTime(date) {
 	return date;
 }
@@ -186,27 +168,27 @@ function initPhrases(loggedIn, panel = false) {
 
 function fetchPhrases(plist) {
 	fetch("/api/phrases/?q="+plist, {cache: "no-cache"})
-		.then((resp) => resp.json())
-		.then((data) => {
+		.then(resp => resp.json())
+		.then(data => {
 			console.log("loaded phrase endpoint data");
-			console.log("data:",data);
-			Object.keys(tmplInits).forEach((key) => {
+			console.log("data",data);
+			Object.keys(tmplInits).forEach(key => {
 				let phrases = [];
 				let tmplInit = tmplInits[key];
 				for(let phraseName of tmplInit) phrases.push(data[phraseName]);
 				console.log("Adding phrases");
-				console.log("key:",key);
-				console.log("phrases:",phrases);
+				console.log("key",key);
+				console.log("phrases",phrases);
 				tmplPhrases[key] = phrases;
 			});
 
 			let prefixes = {};
-			Object.keys(data).forEach((key) => {
+			Object.keys(data).forEach(key => {
 				let prefix = key.split(".")[0];
 				if(prefixes[prefix]===undefined) prefixes[prefix] = {};
 				prefixes[prefix][key] = data[key];
 			});
-			Object.keys(prefixes).forEach((prefix) => {
+			Object.keys(prefixes).forEach(prefix => {
 				console.log("adding phrase prefix '"+prefix+"' to box");
 				phraseBox[prefix] = prefixes[prefix];
 			});
@@ -217,7 +199,7 @@ function fetchPhrases(plist) {
 
 (() => {
 	runInitHook("pre_iife");
-	let loggedIn = document.head.querySelector("[property='x-loggedin']").content == "true";
+	let loggedIn = document.head.querySelector("[property='x-loggedin']").content=="true";
 	let panel = window.location.pathname.startsWith("/panel/");
 
 	let toLoad = 1;
@@ -246,7 +228,7 @@ function fetchPhrases(plist) {
 		.then(resp => resp.json())
 		.then(data => {
 			console.log("loaded me endpoint data");
-			console.log("data:",data);
+			console.log("data",data);
 			me = data;
 			runInitHook("pre_init");
 		});
diff --git a/public/member.js b/public/member.js
index 0a460d35..583831ff 100644
--- a/public/member.js
+++ b/public/member.js
@@ -78,7 +78,7 @@ var imageExts = ["png", "jpg", "jpe","jpeg","jif","jfi","jfif", "svg", "bmp", "g
 				let req = new XMLHttpRequest();
 				req.addEventListener("load", () => {
 					let data = JSON.parse(req.responseText);
-					//console.log("rdata:",data);
+					//console.log("rdata",data);
 					let fileItem = document.createElement("div");
 					let ext = getExt(filename);
 					// TODO: Push ImageFileExts to the client from the server in some sort of gen.js?
@@ -217,8 +217,8 @@ var imageExts = ["png", "jpg", "jpe","jpeg","jif","jfi","jfif", "svg", "bmp", "g
 		bindAttachManager();
 	});
 		
-	$(".moderate_link").click((event) => {
-		event.preventDefault();
+	$(".moderate_link").click(ev => {
+		ev.preventDefault();
 		$(".pre_opt").removeClass("auto_hide");
 		$(".moderate_link").addClass("moderate_open");
 		$(".topic_row").each(function(){
diff --git a/templates/footer.html b/templates/footer.html
index 58c487ed..20a1b866 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -9,7 +9,7 @@
 		<div id="poweredBy">
 			<a id="poweredByName" href="https://github.com/Azareal/Gosora">{{lang "footer_powered_by"}}</a><span id="poweredByDash"> - </span><span id="poweredByMaker">{{lang "footer_made_with_love"}}</span>
 		</div>
-		{{if .CurrentUser.IsAdmin}}<div title="start to before tmpl" class="elapsed">{{.Header.Elapsed1}}</div><div title="start to footer" class="elapsed">{{elapsed .Header.StartedAt}}</div>{{end}}
+		{{if .CurrentUser.IsAdmin}}<div title="start to before tmpl"class="elapsed">{{.Header.Elapsed1}}</div><div title="start to footer"class="elapsed">{{elapsed .Header.StartedAt}}</div>{{end}}
 		<form action="/theme/" method="post">
 			<div id="themeSelector">
 				<select id="themeSelectorSelect" name="theme" aria-label="{{lang "footer_theme_selector_aria"}}">{{range .Header.Themes}}{{if not .HideFromThemes}}
diff --git a/themes/cosora/public/misc.js b/themes/cosora/public/misc.js
index 3b200d17..a28810c6 100644
--- a/themes/cosora/public/misc.js
+++ b/themes/cosora/public/misc.js
@@ -1,6 +1,12 @@
 "use strict";
 
 (() => {
+	function newElement(etype, eclass) {
+		let element = document.createElement(etype);
+		element.className = eclass;
+		return element;
+	}
+	
 	function moveAlerts() {
 		// Move the alerts under the first header
 		let colSel = $(".colstack_right .colstack_head:first");
@@ -15,7 +21,7 @@
 	//console.log("bf")
 	addInitHook("end_init", () => {
 		//console.log("af")
-		let loggedIn = document.head.querySelector("[property='x-loggedin']").content == "true";
+		let loggedIn = document.head.querySelector("[property='x-loggedin']").content=="true";
 		if(loggedIn) {
 			if(navigator.userAgent.indexOf("Firefox") != -1) $.trumbowyg.svgPath = "/s/trumbowyg/ui/icons.svg";
 			
@@ -29,7 +35,7 @@
 				$('#input_content').trumbowyg('html', currentContent);
 			}
 			
-			$(".topic_name_row").click(function(){
+			$(".topic_name_row").click(() => {
 				$(".topic_create_form").addClass("selectedInput");
 			});
 
@@ -99,11 +105,11 @@
 
 			// Fill in the placeholder grid nodes
 			let rowCount = 4;
-			console.log("rowCount: ",rowCount);
-			console.log("gridElementCount: ",gridElementCount);
+			console.log("rowCount",rowCount);
+			console.log("gridElementCount",gridElementCount);
 			if(gridElementCount%rowCount != 0) {
 				let fillerNodes = (rowCount - (gridElementCount%rowCount));
-				console.log("fillerNodes: ",fillerNodes);
+				console.log("fillerNodes",fillerNodes);
 				for(let i = 0; i < fillerNodes;i++ ) {
 					console.log("added a gridFiller");
 					buttonGrid.appendChild(newElement("div","gridFiller"));
@@ -118,10 +124,4 @@
 	});
 
 	addInitHook("after_notice", moveAlerts);
-})();
-
-function newElement(etype, eclass) {
-	let element = document.createElement(etype);
-	element.className = eclass;
-	return element;
-}
\ No newline at end of file
+})()
\ No newline at end of file
diff --git a/themes/shadow/public/misc.js b/themes/shadow/public/misc.js
index 9302a94e..0a7325f5 100644
--- a/themes/shadow/public/misc.js
+++ b/themes/shadow/public/misc.js
@@ -3,13 +3,13 @@ addInitHook("end_init", () => {
 	// TODO: Run this when the image is loaded rather than when the document is ready?
 	$(".topic_list img").each(function(){
 		let aspectRatio = this.naturalHeight / this.naturalWidth;
-		console.log("aspectRatio ",aspectRatio);
-		console.log("this.height ",this.naturalHeight);
-		console.log("this.width ",this.naturalWidth);
+		console.log("aspectRatio",aspectRatio);
+		console.log("this.height",this.naturalHeight);
+		console.log("this.width",this.naturalWidth);
 
 		$(this).css({
 			height: aspectRatio * this.width
 		});
 	});
 });
-})();
\ No newline at end of file
+})()
\ No newline at end of file
diff --git a/themes/tempra_simple/public/misc.js b/themes/tempra_simple/public/misc.js
index 9302a94e..0a7325f5 100644
--- a/themes/tempra_simple/public/misc.js
+++ b/themes/tempra_simple/public/misc.js
@@ -3,13 +3,13 @@ addInitHook("end_init", () => {
 	// TODO: Run this when the image is loaded rather than when the document is ready?
 	$(".topic_list img").each(function(){
 		let aspectRatio = this.naturalHeight / this.naturalWidth;
-		console.log("aspectRatio ",aspectRatio);
-		console.log("this.height ",this.naturalHeight);
-		console.log("this.width ",this.naturalWidth);
+		console.log("aspectRatio",aspectRatio);
+		console.log("this.height",this.naturalHeight);
+		console.log("this.width",this.naturalWidth);
 
 		$(this).css({
 			height: aspectRatio * this.width
 		});
 	});
 });
-})();
\ No newline at end of file
+})()
\ No newline at end of file