From 6fac25c1e5a9e669f7da4e90631fb3ae948d195d Mon Sep 17 00:00:00 2001
From: Kushagra Gour <chinchang457@gmail.com>
Date: Sun, 19 Nov 2017 18:20:41 +0530
Subject: [PATCH] fix dynamic resource paths and also html generation logic

---
 src/index.html |  8 ++++----
 src/script.js  | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/index.html b/src/index.html
index acf7eb0..8ebc9fb 100644
--- a/src/index.html
+++ b/src/index.html
@@ -11,8 +11,8 @@
 		<link rel="stylesheet" href="lib/hint.min.css">
 		<link rel="stylesheet" href="lib/inlet.css">
 		<!-- endbuild -->
-		
-		<link rel="stylesheet" id="editorThemeLinkTag" href="/lib/codemirror/theme/monokai.css"></link>
+
+		<link rel="stylesheet" id="editorThemeLinkTag" href="lib/codemirror/theme/monokai.css"></link>
 
 		<!-- build:css style.css -->
 		<link rel="stylesheet" href="style.css">
@@ -23,7 +23,7 @@
 				font-family: 'fontname';
 				font-style: normal;
 				font-weight: 400;
-				src: url(../fontname.ttf) format('truetype');
+				src: url(fontname.ttf) format('truetype');
 				unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
 			}
 			.Codemirror pre {
@@ -35,7 +35,7 @@
 				font-family: 'FiraCode';
 				font-style: normal;
 				font-weight: 400;
-				src: url(../FiraCode.ttf) format('truetype');
+				src: url(FiraCode.ttf) format('truetype');
 				unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
 			}
 			.Codemirror pre {
diff --git a/src/script.js b/src/script.js
index b9295ca..4b9b49b 100644
--- a/src/script.js
+++ b/src/script.js
@@ -101,6 +101,7 @@ globalConsoleContainerEl, externalLibrarySearchInput, keyboardShortcutsModal
 	};
 
 	const AUTO_SAVE_INTERVAL = 15000; // 15 seconds
+	const BASE_PATH = chrome.extension ? '/' : '/dist/';
 
 	var updateTimer,
 		updateDelay = 500,
@@ -996,7 +997,7 @@ globalConsoleContainerEl, externalLibrarySearchInput, keyboardShortcutsModal
 				'<script src="' +
 				(chrome.extension
 					? chrome.extension.getURL('lib/screenlog.js')
-					: `${location.origin}/lib/screenlog.js`) +
+					: `${location.origin}/${BASE_PATH}/lib/screenlog.js`) +
 				'"></script>';
 		}
 
@@ -1007,7 +1008,7 @@ globalConsoleContainerEl, externalLibrarySearchInput, keyboardShortcutsModal
 				'"></script>';
 		}
 
-		if (js !== undefined) {
+		if (typeof js === 'string') {
 			contents += '<script>\n' + js + '\n//# sourceURL=userscript.js';
 		} else {
 			var origin = chrome.i18n.getMessage()
@@ -1076,7 +1077,7 @@ globalConsoleContainerEl, externalLibrarySearchInput, keyboardShortcutsModal
 
 	function createPreviewFile(html, css, js) {
 		const shouldInlineJs = !window.webkitRequestFileSystem;
-		var contents = getCompleteHtml(html, css, shouldInlineJs ? js : '');
+		var contents = getCompleteHtml(html, css, shouldInlineJs ? js : null);
 		var blob = new Blob([contents], { type: 'text/plain;charset=UTF-8' });
 		var blobjs = new Blob([js], { type: 'text/plain;charset=UTF-8' });
 
@@ -1721,8 +1722,7 @@ globalConsoleContainerEl, externalLibrarySearchInput, keyboardShortcutsModal
 		indentationSizeValueEl.textContent = $('[data-setting=indentSize]').value;
 
 		// Replace correct css file in LINK tags's href
-		editorThemeLinkTag.href =
-			'/lib/codemirror/theme/' + prefs.editorTheme + '.css';
+		editorThemeLinkTag.href = `lib/codemirror/theme/${prefs.editorTheme}.css`;
 		fontStyleTag.textContent = fontStyleTemplate.textContent.replace(
 			/fontname/g,
 			(prefs.editorFont === 'other'
@@ -1999,7 +1999,7 @@ globalConsoleContainerEl, externalLibrarySearchInput, keyboardShortcutsModal
 	function init() {
 		var lastCode;
 
-		CodeMirror.modeURL = 'lib/codemirror/mode/%N/%N.js';
+		CodeMirror.modeURL = `${BASE_PATH}/lib/codemirror/mode/%N/%N.js`;
 
 		function getToggleLayoutButtonListener(mode) {
 			return function() {