Skip to content

Commit 9867fda

Browse files
author
Benjamin Pasero
committed
debt - get rid of flags.ts
1 parent dd31d3d commit 9867fda

2 files changed

Lines changed: 13 additions & 22 deletions

File tree

src/vs/base/common/flags.ts

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/vs/base/worker/defaultWorkerFactory.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,24 @@
44
*--------------------------------------------------------------------------------------------*/
55
'use strict';
66

7-
import * as flags from 'vs/base/common/flags';
7+
import { globals } from 'vs/base/common/platform';
88
import { logOnceWebWorkerWarning, IWorker, IWorkerCallback, IWorkerFactory } from 'vs/base/common/worker/simpleWorker';
99

10+
// Option for hosts to overwrite the worker script url (used in the standalone editor)
11+
const getCrossOriginWorkerScriptUrl: (workerId: string, label: string) => string = environment('getWorkerUrl', null);
12+
13+
function environment(name: string, fallback: any = false): any {
14+
if (globals.MonacoEnvironment && globals.MonacoEnvironment.hasOwnProperty(name)) {
15+
return globals.MonacoEnvironment[name];
16+
}
17+
18+
return fallback;
19+
}
20+
1021
function defaultGetWorkerUrl(workerId: string, label: string): string {
1122
return require.toUrl('./' + workerId) + '#' + label;
1223
}
13-
var getWorkerUrl = flags.getCrossOriginWorkerScriptUrl || defaultGetWorkerUrl;
14-
24+
var getWorkerUrl = getCrossOriginWorkerScriptUrl || defaultGetWorkerUrl;
1525

1626
/**
1727
* A worker that uses HTML5 web workers so that is has

0 commit comments

Comments
 (0)