Merge branch 'mihailik-patch-1'

mhegazy · mhegazy · commit 86a121c5ead7 · 2015-06-26T10:26:25.000-07:00
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -191,7 +191,8 @@ namespace ts {
             return sys.exit(ExitStatus.Success);
         }
 
-        if (commandLine.options.watch) {
+        // Firefox has Object.prototype.watch
+        if (commandLine.options.watch && commandLine.options.hasOwnProperty("watch")) {
             if (!sys.watchFile) {
                 reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"));
                 return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,8 @@ namespace ts {`
`191`	`191`	`return sys.exit(ExitStatus.Success);`
`192`	`192`	`}`
`193`	`193`
`194`		`- if (commandLine.options.watch) {`
	`194`	`+ // Firefox has Object.prototype.watch`
	`195`	`+ if (commandLine.options.watch && commandLine.options.hasOwnProperty("watch")) {`
`195`	`196`	`if (!sys.watchFile) {`
`196`	`197`	`reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"));`
`197`	`198`	`return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);`