Merge branch 'patch-2' of https://github.com/mihailik/TypeScript into mihailik-patch-2
This commit is contained in:
commit
83e7f6da91
1 changed files with 4 additions and 4 deletions
|
@ -642,7 +642,10 @@ namespace ts {
|
|||
};
|
||||
}
|
||||
|
||||
if (typeof WScript !== "undefined" && typeof ActiveXObject === "function") {
|
||||
if (typeof ChakraHost !== "undefined") {
|
||||
return getChakraSystem();
|
||||
}
|
||||
else if (typeof WScript !== "undefined" && typeof ActiveXObject === "function") {
|
||||
return getWScriptSystem();
|
||||
}
|
||||
else if (typeof process !== "undefined" && process.nextTick && !process.browser && typeof require !== "undefined") {
|
||||
|
@ -650,9 +653,6 @@ namespace ts {
|
|||
// process.browser check excludes webpack and browserify
|
||||
return getNodeSystem();
|
||||
}
|
||||
else if (typeof ChakraHost !== "undefined") {
|
||||
return getChakraSystem();
|
||||
}
|
||||
else {
|
||||
return undefined; // Unsupported host
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue