From 6904e8eb26cfad2dcef23c48cd4e7414cf262653 Mon Sep 17 00:00:00 2001
From: shockrah <alejandros714@protonmail.com>
Date: Fri, 12 Feb 2021 15:50:05 -0800
Subject: [PATCH] using env vars for some comfy defaults for development

---
 freechat-client/main.js     | 8 +++++++-
 freechat-client/make        | 3 +++
 freechat-client/src/html.js | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/freechat-client/main.js b/freechat-client/main.js
index fedddde..65923ed 100644
--- a/freechat-client/main.js
+++ b/freechat-client/main.js
@@ -8,6 +8,10 @@ const cfg = require('./src/config.js')
 let win
 let config 	= cfg.get_config(cfg.load_parser())
 
+// NOTE: this line is only here for demonstration as the current make script exposes this var
+// so that we can test against self signed certificates but still use ssl
+// process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = '0'
+
 function createWin() {
 	win = new BrowserWindow({
 		width: 800,
@@ -23,7 +27,9 @@ function createWin() {
 
 	win.loadFile('pages/index.html');
 	if(process.platform !== 'darwin') {
-		win.removeMenu();
+		if(!process.env('DEV_ENV')) {
+			win.removeMenu()
+		}
 	}
 	win.on('closed', () => {
 		win = null
diff --git a/freechat-client/make b/freechat-client/make
index d1355ca..c5aaeee 100755
--- a/freechat-client/make
+++ b/freechat-client/make
@@ -6,6 +6,9 @@
 [[ -z "$1" ]] && echo Options: run \| build && exit 0
 
 run() {
+	# Required to tests against the self certs we use in testing envs
+	export NODE_TLS_REJECT_UNAUTHORIZED=0
+	export DEV_ENV=true
 	./node_modules/electron/dist/electron main.js $@
 }
 
diff --git a/freechat-client/src/html.js b/freechat-client/src/html.js
index 66cb486..623aad5 100644
--- a/freechat-client/src/html.js
+++ b/freechat-client/src/html.js
@@ -45,8 +45,8 @@ exports.build_server_list = function (config, dom_id) {
 			'classList': ['btn', 'btn-outline-secondary', 'btn-nav-settings'],
 			'textContent': server['name'],
 			'type': 'button',
-			'onClick': channels.get_channels(server)
 		})
+		child.addEventListener('click', () => channels.get_channels(server))
 
 		container.appendChild(child)
 	}