github-forks
/
monaco-editor
mirror of https://github.com/microsoft/monaco-editor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce reliance on METADATA

Browse Source
pull/237/head
Alex Dima 9 years ago
parent 6047f09f96
commit a7179b0bef
7 changed files with 55 additions and 43 deletions
Show Stats Download Patch File Download Diff File

2
test/cross-origin-broken.html
Unescape Escape View File

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

2
test/cross-origin-good.html
Unescape Escape View File

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

86
test/dev-setup.js
Unescape Escape View File

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

2
test/index.html
Unescape Escape View File

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

2
test/mouse-fixed.html
Unescape Escape View File

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

2
test/mouse-scrollable-body.html
Unescape Escape View File

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

2
test/mouse-scrollable-element.html
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save