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

Merge pull request #101 from caohuilin/fix-worker-url

Browse Source 
Fix getWorkerUrl Regex
pull/2748/head
Alexandru Dima 5 years ago committed by GitHub
parent 8617e98da3 0625d2630b
commit 9548c68804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File

2
src/index.ts
Unescape Escape View File

@ -197,7 +197,7 @@ function createLoaderRules(languages: IFeatureDefinition[], features: IFeatureDe
getWorkerUrl: function (moduleId, label) { getWorkerUrl: function (moduleId, label) {
var pathPrefix = ${pathPrefix}; var pathPrefix = ${pathPrefix};
var result = (pathPrefix ? stripTrailingSlash(pathPrefix) + '/' : '') + paths[label]; var result = (pathPrefix ? stripTrailingSlash(pathPrefix) + '/' : '') + paths[label];
if (/^(http:)|(https:)|(file:)/.test(result)) { if (/^((http:)|(https:)|(file:)|(\/\/))/.test(result)) {
var currentUrl = String(window.location); var currentUrl = String(window.location);
var currentOrigin = currentUrl.substr(0, currentUrl.length - window.location.hash.length - window.location.search.length - window.location.pathname.length); var currentOrigin = currentUrl.substr(0, currentUrl.length - window.location.hash.length - window.location.search.length - window.location.pathname.length);
if (result.substring(0, currentOrigin.length) !== currentOrigin) { if (result.substring(0, currentOrigin.length) !== currentOrigin) {

Write Preview
Loading…
Cancel
Save