Merge pull request #1978 from Tyriar/move_windows_check

Let consumers decide whether winptyCompat should be active
xtermjs · Mar 30, 2019 · 10b7b46 · 10b7b46
2 parents 2317a31 + e6ac563
commit 10b7b46
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/demo/client.ts b/demo/client.ts
@@ -30,7 +30,10 @@ Terminal.applyAddon(fit);
 Terminal.applyAddon(fullscreen);
 Terminal.applyAddon(search);
 Terminal.applyAddon(webLinks);
-Terminal.applyAddon(winptyCompat);
+const isWindows = ['Windows', 'Win16', 'Win32', 'WinCE'].indexOf(navigator.platform) >= 0;
+if (isWindows) {
+  Terminal.applyAddon(winptyCompat);
+}
 
 
 let term;

diff --git a/src/addons/winptyCompat/winptyCompat.ts b/src/addons/winptyCompat/winptyCompat.ts
@@ -13,12 +13,6 @@ const WHITESPACE_CELL_CODE = 32;
 export function winptyCompatInit(terminal: Terminal): void {
   const addonTerminal = <IWinptyCompatAddonTerminal>terminal;
 
-  // Don't do anything when the platform is not Windows
-  const isWindows = ['Windows', 'Win16', 'Win32', 'WinCE'].indexOf(navigator.platform) >= 0;
-  if (!isWindows) {
-    return;
-  }
-
   (addonTerminal._core as any).isWinptyCompatEnabled = true;
 
   // Winpty does not support wraparound mode which means that lines will never