From a7179b0befaf5f9e4cbc06f6c29630df891191de Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 24 Aug 2016 10:09:33 +0200
Subject: [PATCH] Reduce reliance on METADATA

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

diff --git a/test/cross-origin-broken.html b/test/cross-origin-broken.html
index b378ce68..26ec29ac 100644
--- a/test/cross-origin-broken.html
+++ b/test/cross-origin-broken.html
@@ -14,7 +14,7 @@
 
 <script src="../metadata.js"></script>
 <script src="dev-setup.js"></script>
-<script>document.write('<script src="http://localhost:8088' + METADATA.CORE.path + '/loader.js"><'+'/script>');</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 1e399c62..85ae1b9a 100644
--- a/test/cross-origin-good.html
+++ b/test/cross-origin-good.html
@@ -21,7 +21,7 @@
 		}
 	};
 </script>
-<script>document.write('<script src="http://localhost:8088' + METADATA.CORE.path + '/loader.js"><'+'/script>');</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 11b4b568..457dc32e 100644
--- a/test/dev-setup.js
+++ b/test/dev-setup.js
@@ -1,50 +1,62 @@
+(function() {
 
-function loadDevEditor() {
-	return (getQueryStringValue('editor') === 'dev');
-}
+	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 getQueryStringValue (key) {
+		return unescape(window.location.search.replace(new RegExp("^(?:.*[&\\?]" + escape(key).replace(/[\.\+\*]/g, "\\$&") + "(?:\\=([^&]*))?)?.*$", "i"), "$1"));
+	}
 
-(function() {
-	// Resolve paths
-	// should run the editor and/or plugins from source? (or from the node module)
-	if (loadDevEditor()) {
-		METADATA.CORE.path = METADATA.CORE.srcPath;
-	} else {
-		METADATA.CORE.path = '/monaco-editor/' + METADATA.CORE.path;
+	function resolveCorePath(core) {
+		if (loadDevEditor()) {
+			return core.srcPath;
+		} else {
+			return '/monaco-editor/' + core.path;
+		}
 	}
-	METADATA.PLUGINS.forEach(function(plugin) {
-		// should run the editor plugins from source? (or from node modules)
+
+	function resolvePluginPath(plugin) {
 		if (plugin.srcPath && getQueryStringValue(plugin.name) === 'dev') {
-			plugin.path = plugin.srcPath;
+			return plugin.srcPath;
 		} else {
-			plugin.path = '/monaco-editor/' + plugin.path;
+			return '/monaco-editor/' + plugin.path;
 		}
-	});
-})();
+	}
 
-function loadEditor(callback, PATH_PREFIX) {
-	PATH_PREFIX = PATH_PREFIX || '';
-	var pathsConfig = {};
-	METADATA.PLUGINS.forEach(function(plugin) {
-		pathsConfig[plugin.modulePrefix] = PATH_PREFIX + plugin.path;
+	self.RESOLVED_CORE_PATH = resolveCorePath(METADATA.CORE);
+	var RESOLVED_PLUGINS = METADATA.PLUGINS.map(function(plugin) {
+		return {
+			name: plugin.name,
+			contrib: plugin.contrib,
+			modulePrefix: plugin.modulePrefix,
+			path: resolvePluginPath(plugin)
+		};
 	});
-	pathsConfig['vs'] = PATH_PREFIX + METADATA.CORE.path;
+	self.METADATA = null;
 
-	// console.log(JSON.stringify(pathsConfig, null, '\t'));
+	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;
 
-	require.config({
-		paths: pathsConfig
-	});
+		console.log('LOADER PATH CONFIGURATION: ');
+		console.log(JSON.stringify(pathsConfig, null, '\t'));
 
-	require(['vs/editor/editor.main'], function() {
-		// At this point we've loaded the monaco-editor-core
-		require(METADATA.PLUGINS.map(function(plugin) { return plugin.contrib; }), function() {
-			// At this point we've loaded all the plugins
-			callback();
-			// require(['./index'], function() {});
+		require.config({
+			paths: pathsConfig
 		});
-	});
-}
\ No newline at end of file
+
+		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() {});
+			});
+		});
+	}
+})();
diff --git a/test/index.html b/test/index.html
index 3bb72444..840128f4 100644
--- a/test/index.html
+++ b/test/index.html
@@ -34,7 +34,7 @@
 
 <script src="../metadata.js"></script>
 <script src="dev-setup.js"></script>
-<script>document.write('<script src="' + METADATA.CORE.path + '/loader.js"><'+'/script>');</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 a5a801af..8769e3f4 100644
--- a/test/mouse-fixed.html
+++ b/test/mouse-fixed.html
@@ -12,7 +12,7 @@
 
 <script src="../metadata.js"></script>
 <script src="dev-setup.js"></script>
-<script>document.write('<script src="' + METADATA.CORE.path + '/loader.js"><'+'/script>');</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 b4fa007d..09e172a6 100644
--- a/test/mouse-scrollable-body.html
+++ b/test/mouse-scrollable-body.html
@@ -171,7 +171,7 @@
 
 <script src="../metadata.js"></script>
 <script src="dev-setup.js"></script>
-<script>document.write('<script src="' + METADATA.CORE.path + '/loader.js"><'+'/script>');</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 fdf7d45f..0a02bf9f 100644
--- a/test/mouse-scrollable-element.html
+++ b/test/mouse-scrollable-element.html
@@ -123,7 +123,7 @@
 
 <script src="../metadata.js"></script>
 <script src="dev-setup.js"></script>
-<script>document.write('<script src="' + METADATA.CORE.path + '/loader.js"><'+'/script>');</script>
+<script>document.write('<script src="' + RESOLVED_CORE_PATH + '/loader.js"><'+'/script>');</script>
 <script>
 	loadEditor(function() {
 		monaco.editor.create(document.getElementById('editor'), {