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

Remove reliance on loadDevEditor

Browse source
This commit is contained in:
Alex Dima 2016-08-24 11:34:53 +02:00
parent 745893d211
commit 17faf6a3b7
4 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@
<script> <script>
window.MonacoEnvironment = { window.MonacoEnvironment = {
getWorkerUrl: function() { getWorkerUrl: function() {
return loadDevEditor() ? 'cross-origin-worker-proxy-dev.js' : 'cross-origin-worker-proxy.js'; return 'cross-origin-worker-proxy.js#http://localhost:8088' + RESOLVED_CORE_PATH;
} }
}; };
</script> </script>

4
test/cross-origin-worker-proxy-dev.js
View file

@ -1,4 +0,0 @@
self.MonacoEnvironment = {
baseUrl: 'http://localhost:8088/vscode/out/'
};
importScripts('http://localhost:8088/vscode/out/vs/base/worker/workerMain.js');

10
test/cross-origin-worker-proxy.js
View file

@ -1,4 +1,10 @@
var baseUrl = self.location.hash;
baseUrl = baseUrl.replace(/^#/, '');
baseUrl = baseUrl.replace(/vs$/, '');
console.log('WORKER BASE_URL: ' + baseUrl);
self.MonacoEnvironment = { self.MonacoEnvironment = {
baseUrl: 'http://localhost:8088/monaco-editor/node_modules/monaco-editor-core/min/' baseUrl: baseUrl
}; };
importScripts('http://localhost:8088/monaco-editor/node_modules/monaco-editor-core/min/vs/base/worker/workerMain.js'); importScripts(baseUrl + 'vs/base/worker/workerMain.js');

11
test/dev-setup.js
View file

@ -42,10 +42,11 @@
var RESOLVED_CORE = new Component('editor', 'vs', METADATA.CORE.paths); var RESOLVED_CORE = new Component('editor', 'vs', METADATA.CORE.paths);
self.RESOLVED_CORE_PATH = RESOLVED_CORE.getResolvedPath();
var RESOLVED_PLUGINS = METADATA.PLUGINS.map(function(plugin) { var RESOLVED_PLUGINS = METADATA.PLUGINS.map(function(plugin) {
return new Component(plugin.name, plugin.modulePrefix, plugin.paths, plugin.contrib); return new Component(plugin.name, plugin.modulePrefix, plugin.paths, plugin.contrib);
}); });
self.METADATA = null; METADATA = null;
function loadScript(path, callback) { function loadScript(path, callback) {
@ -58,14 +59,6 @@
} }
self.loadDevEditor = function() {
return (getQueryStringValue('editor') === 'dev');
}
function getQueryStringValue (key) {
return unescape(window.location.search.replace(new RegExp("^(?:.*[&\\?]" + escape(key).replace(/[\.\+\*]/g, "\\$&") + "(?:\\=([^&]*))?)?.*$", "i"), "$1"));
}
self.loadEditor = function(callback, PATH_PREFIX) { self.loadEditor = function(callback, PATH_PREFIX) {
PATH_PREFIX = PATH_PREFIX || ''; PATH_PREFIX = PATH_PREFIX || '';