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

Reduce reliance on METADATA

Browse source
This commit is contained in:
Alex Dima 2016-08-24 10:09:33 +02:00
parent 6047f09f96
commit a7179b0bef
7 changed files with 61 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@
<script src="../metadata.js"></script> <script src="../metadata.js"></script>
<script src="dev-setup.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> <script>
loadEditor(function() { loadEditor(function() {
monaco.editor.create(document.getElementById('container'), { monaco.editor.create(document.getElementById('container'), {

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

@ -21,7 +21,7 @@
} }
}; };
</script> </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> <script>
loadEditor(function() { loadEditor(function() {
monaco.editor.create(document.getElementById('container'), { monaco.editor.create(document.getElementById('container'), {

50
test/dev-setup.js
View file

@ -1,5 +1,6 @@
(function() {
function loadDevEditor() { self.loadDevEditor = function() {
return (getQueryStringValue('editor') === 'dev'); return (getQueryStringValue('editor') === 'dev');
} }
@ -7,33 +8,43 @@ function getQueryStringValue (key) {
return unescape(window.location.search.replace(new RegExp("^(?:.*[&\\?]" + escape(key).replace(/[\.\+\*]/g, "\\$&") + "(?:\\=([^&]*))?)?.*$", "i"), "$1")); return unescape(window.location.search.replace(new RegExp("^(?:.*[&\\?]" + escape(key).replace(/[\.\+\*]/g, "\\$&") + "(?:\\=([^&]*))?)?.*$", "i"), "$1"));
} }
(function() { function resolveCorePath(core) {
// Resolve paths
// should run the editor and/or plugins from source? (or from the node module)
if (loadDevEditor()) { if (loadDevEditor()) {
METADATA.CORE.path = METADATA.CORE.srcPath; return core.srcPath;
} else { } else {
METADATA.CORE.path = '/monaco-editor/' + METADATA.CORE.path; return '/monaco-editor/' + core.path;
} }
METADATA.PLUGINS.forEach(function(plugin) {
// should run the editor plugins from source? (or from node modules)
if (plugin.srcPath && getQueryStringValue(plugin.name) === 'dev') {
plugin.path = plugin.srcPath;
} else {
plugin.path = '/monaco-editor/' + plugin.path;
} }
});
})();
function loadEditor(callback, PATH_PREFIX) { function resolvePluginPath(plugin) {
if (plugin.srcPath && getQueryStringValue(plugin.name) === 'dev') {
return plugin.srcPath;
} else {
return '/monaco-editor/' + 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)
};
});
self.METADATA = null;
self.loadEditor = function(callback, PATH_PREFIX) {
PATH_PREFIX = PATH_PREFIX || ''; PATH_PREFIX = PATH_PREFIX || '';
var pathsConfig = {}; var pathsConfig = {};
METADATA.PLUGINS.forEach(function(plugin) { RESOLVED_PLUGINS.forEach(function(plugin) {
pathsConfig[plugin.modulePrefix] = PATH_PREFIX + plugin.path; pathsConfig[plugin.modulePrefix] = PATH_PREFIX + plugin.path;
}); });
pathsConfig['vs'] = PATH_PREFIX + METADATA.CORE.path; pathsConfig['vs'] = PATH_PREFIX + RESOLVED_CORE_PATH;
// console.log(JSON.stringify(pathsConfig, null, '\t')); console.log('LOADER PATH CONFIGURATION: ');
console.log(JSON.stringify(pathsConfig, null, '\t'));
require.config({ require.config({
paths: pathsConfig paths: pathsConfig
@ -41,10 +52,11 @@ function loadEditor(callback, PATH_PREFIX) {
require(['vs/editor/editor.main'], function() { require(['vs/editor/editor.main'], function() {
// At this point we've loaded the monaco-editor-core // At this point we've loaded the monaco-editor-core
require(METADATA.PLUGINS.map(function(plugin) { return plugin.contrib; }), function() { require(RESOLVED_PLUGINS.map(function(plugin) { return plugin.contrib; }), function() {
// At this point we've loaded all the plugins // At this point we've loaded all the plugins
callback(); callback();
// require(['./index'], function() {}); // require(['./index'], function() {});
}); });
}); });
} }
})();

2
test/index.html
View file

@ -34,7 +34,7 @@
<script src="../metadata.js"></script> <script src="../metadata.js"></script>
<script src="dev-setup.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> <script>
loadEditor(function() { loadEditor(function() {
require(['./index'], function() {}); require(['./index'], function() {});

2
test/mouse-fixed.html
View file

@ -12,7 +12,7 @@
<script src="../metadata.js"></script> <script src="../metadata.js"></script>
<script src="dev-setup.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> <script>
loadEditor(function() { loadEditor(function() {
monaco.editor.create(document.getElementById('Editor'), { monaco.editor.create(document.getElementById('Editor'), {

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

@ -171,7 +171,7 @@
<script src="../metadata.js"></script> <script src="../metadata.js"></script>
<script src="dev-setup.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> <script>
loadEditor(function() { loadEditor(function() {
monaco.editor.create(document.getElementById('editor'), { monaco.editor.create(document.getElementById('editor'), {

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

@ -123,7 +123,7 @@
<script src="../metadata.js"></script> <script src="../metadata.js"></script>
<script src="dev-setup.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> <script>
loadEditor(function() { loadEditor(function() {
monaco.editor.create(document.getElementById('editor'), { monaco.editor.create(document.getElementById('editor'), {