SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 16:15:41 +01:00
Code Issues Projects Releases Packages Activity

Reduce reliance on RESOLVED_CORE_PATH

Browse source
This commit is contained in:
Alex Dima 2016-08-24 11:25:24 +02:00
parent 346cb83091
commit 745893d211
7 changed files with 56 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/cross-origin-broken.html
View file

@ -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'), {

1
test/cross-origin-good.html
View file

@ -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'), {

85
test/dev-setup.js
View file

@ -1,6 +1,6 @@
(function() {
function parseLoaderOptions() {
var LOADER_OPTS = (function() {
function parseQueryString() {
var str = window.location.search;
str = str.replace(/^\?/, '');
@ -19,55 +19,68 @@
result[plugin.name] = overwrites[plugin.name] || 'npm';
});
return result;
}
var LOADER_OPTS = parseLoaderOptions();
})();
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);
}
// 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);
console.log('LOADER CONFIG: ');
console.log(JSON.stringify(loaderPathsConfig, null, '\t'));
require.config({
paths: pathsConfig
paths: loaderPathsConfig
});
require(['vs/editor/editor.main'], function() {
@ -75,7 +88,7 @@
require(RESOLVED_PLUGINS.map(function(plugin) { return plugin.contrib; }), function() {
// At this point we've loaded all the plugins
callback();
// require(['./index'], function() {});
});
});
});
}

1
test/index.html
View file

@ -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() {});

1
test/mouse-fixed.html
View file

@ -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'), {

1
test/mouse-scrollable-body.html
View file

@ -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'), {

1
test/mouse-scrollable-element.html
View file

@ -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'), {