From 745893d211ce6aa1aa2b720152ed1f4b84ecb771 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 24 Aug 2016 11:25:24 +0200
Subject: [PATCH] Reduce reliance on RESOLVED_CORE_PATH

---
 test/cross-origin-broken.html      |  1 -
 test/cross-origin-good.html        |  1 -
 test/dev-setup.js                  | 97 +++++++++++++++++-------------
 test/index.html                    |  1 -
 test/mouse-fixed.html              |  1 -
 test/mouse-scrollable-body.html    |  1 -
 test/mouse-scrollable-element.html |  1 -
 7 files changed, 55 insertions(+), 48 deletions(-)

diff --git a/test/cross-origin-broken.html b/test/cross-origin-broken.html
index 26ec29ac..dc767df3 100644
--- a/test/cross-origin-broken.html
+++ b/test/cross-origin-broken.html
@@ -14,7 +14,6 @@
 
 <script src="../metadata.js"></script>
 <script src="dev-setup.js"></script>
-<script>document.write('<script src="http://localhost:8088' + RESOLVED_CORE_PATH + '/loader.js"><'+'/script>');</script>
 <script>
 	loadEditor(function() {
 		monaco.editor.create(document.getElementById('container'), {
diff --git a/test/cross-origin-good.html b/test/cross-origin-good.html
index 85ae1b9a..9c27d252 100644
--- a/test/cross-origin-good.html
+++ b/test/cross-origin-good.html
@@ -21,7 +21,6 @@
 		}
 	};
 </script>
-<script>document.write('<script src="http://localhost:8088' + RESOLVED_CORE_PATH + '/loader.js"><'+'/script>');</script>
 <script>
 	loadEditor(function() {
 		monaco.editor.create(document.getElementById('container'), {
diff --git a/test/dev-setup.js b/test/dev-setup.js
index fcf7d4a6..9a3b542c 100644
--- a/test/dev-setup.js
+++ b/test/dev-setup.js
@@ -1,6 +1,6 @@
 (function() {
 
-	function parseLoaderOptions() {
+	var LOADER_OPTS = (function() {
 		function parseQueryString() {
 			var str = window.location.search;
 			str = str.replace(/^\?/, '');
@@ -19,63 +19,76 @@
 			result[plugin.name] = overwrites[plugin.name] || 'npm';
 		});
 		return result;
+	})();
+
+
+	function Component(name, modulePrefix, paths, contrib) {
+		this.name = name;
+		this.modulePrefix = modulePrefix;
+		this.paths = paths;
+		this.contrib = contrib;
+		this.selectedPath = LOADER_OPTS[name];
+	}
+	Component.prototype.getResolvedPath = function() {
+		var resolvedPath = this.paths[this.selectedPath];
+		if (this.selectedPath === 'npm') {
+			resolvedPath = '/monaco-editor/' + resolvedPath;
+		}
+		return resolvedPath;
+	};
+	Component.prototype.generateLoaderConfig = function(dest) {
+		dest[this.modulePrefix] = this.getResolvedPath();
+	};
+
+
+	var RESOLVED_CORE = new Component('editor', 'vs', METADATA.CORE.paths);
+	var RESOLVED_PLUGINS = METADATA.PLUGINS.map(function(plugin) {
+		return new Component(plugin.name, plugin.modulePrefix, plugin.paths, plugin.contrib);
+	});
+	self.METADATA = null;
+
+
+	function loadScript(path, callback) {
+		var script = document.createElement('script');
+		script.onload = callback;
+		script.async = true;
+		script.type = 'text/javascript';
+		script.src = path;
+		document.head.appendChild(script);
 	}
-	var LOADER_OPTS = parseLoaderOptions();
 
-	// console.log(JSON.stringify(LOADER_OPTS, null, '\t'));
 
 	self.loadDevEditor = function() {
 		return (getQueryStringValue('editor') === 'dev');
 	}
-
 	function getQueryStringValue (key) {
 		return unescape(window.location.search.replace(new RegExp("^(?:.*[&\\?]" + escape(key).replace(/[\.\+\*]/g, "\\$&") + "(?:\\=([^&]*))?)?.*$", "i"), "$1"));
 	}
 
 
-	function resolvePath(paths, selectedPath) {
-		if (selectedPath === 'npm') {
-			return '/monaco-editor/' + paths[selectedPath];
-		} else {
-			return paths[selectedPath];
-		}
-	}
-	self.RESOLVED_CORE_PATH = resolvePath(METADATA.CORE.paths, LOADER_OPTS['editor']);
-	var RESOLVED_PLUGINS = METADATA.PLUGINS.map(function(plugin) {
-		return {
-			name: plugin.name,
-			contrib: plugin.contrib,
-			modulePrefix: plugin.modulePrefix,
-			path: resolvePath(plugin.paths, LOADER_OPTS[plugin.name])
-		};
-	});
-	self.METADATA = null;
-
 	self.loadEditor = function(callback, PATH_PREFIX) {
 		PATH_PREFIX = PATH_PREFIX || '';
-		var pathsConfig = {};
-		RESOLVED_PLUGINS.forEach(function(plugin) {
-			pathsConfig[plugin.modulePrefix] = PATH_PREFIX + plugin.path;
-		});
-		pathsConfig['vs'] = PATH_PREFIX + RESOLVED_CORE_PATH;
 
-		var loaderInfo = document.createElement('div');
-		loaderInfo.style.position = 'fixed';
-		loaderInfo.style.top = 0;
-		loaderInfo.style.right = 0;
-		loaderInfo.innerHTML = 'LOADER PATH CONFIGURATION: ' + '<br/><pre>' + JSON.stringify(pathsConfig, null, '\t') + '</pre>';
-		document.body.appendChild(loaderInfo);
+		loadScript(PATH_PREFIX + RESOLVED_CORE.getResolvedPath() + '/loader.js', function() {
+			var loaderPathsConfig = {};
+			RESOLVED_PLUGINS.forEach(function(plugin) {
+				plugin.generateLoaderConfig(loaderPathsConfig);
+			});
+			RESOLVED_CORE.generateLoaderConfig(loaderPathsConfig);
 
-		require.config({
-			paths: pathsConfig
-		});
+			console.log('LOADER CONFIG: ');
+			console.log(JSON.stringify(loaderPathsConfig, null, '\t'));
+
+			require.config({
+				paths: loaderPathsConfig
+			});
 
-		require(['vs/editor/editor.main'], function() {
-			// At this point we've loaded the monaco-editor-core
-			require(RESOLVED_PLUGINS.map(function(plugin) { return plugin.contrib; }), function() {
-				// At this point we've loaded all the plugins
-				callback();
-				// require(['./index'], function() {});
+			require(['vs/editor/editor.main'], function() {
+				// At this point we've loaded the monaco-editor-core
+				require(RESOLVED_PLUGINS.map(function(plugin) { return plugin.contrib; }), function() {
+					// At this point we've loaded all the plugins
+					callback();
+				});
 			});
 		});
 	}
diff --git a/test/index.html b/test/index.html
index 840128f4..cbe00c2b 100644
--- a/test/index.html
+++ b/test/index.html
@@ -34,7 +34,6 @@
 
 <script src="../metadata.js"></script>
 <script src="dev-setup.js"></script>
-<script>document.write('<script src="' + RESOLVED_CORE_PATH + '/loader.js"><'+'/script>');</script>
 <script>
 	loadEditor(function() {
 		require(['./index'], function() {});
diff --git a/test/mouse-fixed.html b/test/mouse-fixed.html
index 8769e3f4..3533646f 100644
--- a/test/mouse-fixed.html
+++ b/test/mouse-fixed.html
@@ -12,7 +12,6 @@
 
 <script src="../metadata.js"></script>
 <script src="dev-setup.js"></script>
-<script>document.write('<script src="' + RESOLVED_CORE_PATH + '/loader.js"><'+'/script>');</script>
 <script>
 	loadEditor(function() {
 		monaco.editor.create(document.getElementById('Editor'), {
diff --git a/test/mouse-scrollable-body.html b/test/mouse-scrollable-body.html
index 09e172a6..9eae8eb1 100644
--- a/test/mouse-scrollable-body.html
+++ b/test/mouse-scrollable-body.html
@@ -171,7 +171,6 @@
 
 <script src="../metadata.js"></script>
 <script src="dev-setup.js"></script>
-<script>document.write('<script src="' + RESOLVED_CORE_PATH + '/loader.js"><'+'/script>');</script>
 <script>
 	loadEditor(function() {
 		monaco.editor.create(document.getElementById('editor'), {
diff --git a/test/mouse-scrollable-element.html b/test/mouse-scrollable-element.html
index 0a02bf9f..6dfe6eff 100644
--- a/test/mouse-scrollable-element.html
+++ b/test/mouse-scrollable-element.html
@@ -123,7 +123,6 @@
 
 <script src="../metadata.js"></script>
 <script src="dev-setup.js"></script>
-<script>document.write('<script src="' + RESOLVED_CORE_PATH + '/loader.js"><'+'/script>');</script>
 <script>
 	loadEditor(function() {
 		monaco.editor.create(document.getElementById('editor'), {