Skip to content

Commit

Permalink
MonacoEnvironment => GlobalEnvironment
Browse files Browse the repository at this point in the history
  • Loading branch information
bpasero committed Apr 25, 2016
1 parent f4321ec commit 70072cb
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions src/vs/base/common/flags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ export const standaloneEditorTelemetryEndpoint: string = environment('telemetryE
export const getCrossOriginWorkerScriptUrl: (workerId: string, label: string) => string = environment('getWorkerUrl', null);

function environment(name: string, fallback: any = false): any {
if (globals.MonacoEnvironment && globals.MonacoEnvironment.hasOwnProperty(name)) {
return globals.MonacoEnvironment[name];
if (globals.GlobalEnvironment && globals.GlobalEnvironment.hasOwnProperty(name)) {
return globals.GlobalEnvironment[name];
}

return fallback;
Expand Down
4 changes: 2 additions & 2 deletions src/vs/base/common/worker/workerClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ export class WorkerClient {
loaderConfiguration = (<any>window).requirejs.s.contexts._.config;
}

let MonacoEnvironment = (<any>window).MonacoEnvironment || null;
let GlobalEnvironment = (<any>window).GlobalEnvironment || null;

this.onModuleLoaded = this._sendMessage(workerProtocol.MessageType.INITIALIZE, {
id: this._worker.getId(),
moduleId: moduleId,
loaderConfiguration: loaderConfiguration,
MonacoEnvironment: MonacoEnvironment
GlobalEnvironment: GlobalEnvironment
});
this.onModuleLoaded.then(null, (e) => this._onError('Worker failed to load ' + moduleId, e));

Expand Down
6 changes: 3 additions & 3 deletions src/vs/base/common/worker/workerServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,9 @@ export class WorkerServer {
(<any>self).require.config(loaderConfig);
}

var MonacoEnvironment = msg.payload.MonacoEnvironment;
if (MonacoEnvironment) {
(<any>self).MonacoEnvironment = MonacoEnvironment;
var GlobalEnvironment = msg.payload.GlobalEnvironment;
if (GlobalEnvironment) {
(<any>self).GlobalEnvironment = GlobalEnvironment;
}

this.loadModule(msg.payload.moduleId, (handlerModule:any) => {
Expand Down
4 changes: 2 additions & 2 deletions src/vs/base/worker/workerMain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
(function () {
'use strict';

var MonacoEnvironment = (<any>self).MonacoEnvironment;
var monacoBaseUrl = MonacoEnvironment && MonacoEnvironment.baseUrl ? MonacoEnvironment.baseUrl : '../../../';
var GlobalEnvironment = (<any>self).GlobalEnvironment;
var monacoBaseUrl = GlobalEnvironment && GlobalEnvironment.baseUrl ? GlobalEnvironment.baseUrl : '../../../';

importScripts(monacoBaseUrl + 'vs/loader.js');

Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/electron-browser/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@
});
}

window.MonacoEnvironment = {};
var timers = window.MonacoEnvironment.timers = {
window.GlobalEnvironment = {};
var timers = window.GlobalEnvironment.timers = {
start: new Date()
};

Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/electron-browser/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import fs = require('fs');
import gracefulFs = require('graceful-fs');
gracefulFs.gracefulify(fs);

const timers = (<any>window).MonacoEnvironment.timers;
const timers = (<any>window).GlobalEnvironment.timers;
const domContentLoaded: Function = (<any>winjs).Utilities.ready;

export interface IPath {
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/electron-browser/shell.ts
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ export class WorkbenchShell {
}

private writeTimers(): void {
let timers = (<any>window).MonacoEnvironment.timers;
let timers = (<any>window).GlobalEnvironment.timers;
if (timers) {
let events: timer.IExistingTimerEvent[] = [];

Expand Down

0 comments on commit 70072cb

Please sign in to comment.