1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-24 15:19:26 -05:00

Merge branch 'master' into add-ts-recv-function

This commit is contained in:
Yingchen Xue 2018-06-09 17:16:13 +08:00 committed by GitHub
commit 5097e228e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View file

@ -59,7 +59,7 @@ export function setup(mainJs: string, mainMap: string): void {
// FileModule.load(). FileModules are NOT executed upon first load, only when
// compileAndRun is called.
export class FileModule {
scriptVersion: string = undefined;
scriptVersion: string;
readonly exports = {};
private static readonly map = new Map<string, FileModule>();
@ -80,7 +80,7 @@ export class FileModule {
compileAndRun(): void {
if (!this.outputCode) {
// If there is no cached outputCode, the compile the code.
// If there is no cached outputCode, then compile the code.
util.assert(
this.sourceCode != null && this.sourceCode.length > 0,
`Have no source code from ${this.fileName}`

View file

@ -81,6 +81,7 @@ export function setInterval(
}
export function clearTimer(id: number) {
timers.delete(id);
pubInternal("timers", {
command: pb.Msg.Command.TIMER_CLEAR,
timerClearId: id