Merge branch 'master' into 1128_addons
This commit is contained in:
+7
-2
@@ -29,7 +29,10 @@ declare let window: IWindowWithTerminal;
|
||||
Terminal.applyAddon(fit);
|
||||
Terminal.applyAddon(fullscreen);
|
||||
Terminal.applyAddon(search);
|
||||
Terminal.applyAddon(winptyCompat);
|
||||
const isWindows = ['Windows', 'Win16', 'Win32', 'WinCE'].indexOf(navigator.platform) >= 0;
|
||||
if (isWindows) {
|
||||
Terminal.applyAddon(winptyCompat);
|
||||
}
|
||||
|
||||
|
||||
let term;
|
||||
@@ -105,7 +108,9 @@ function createTerminal(): void {
|
||||
socketURL = protocol + location.hostname + ((location.port) ? (':' + location.port) : '') + '/terminals/';
|
||||
|
||||
term.open(terminalContainer);
|
||||
term.winptyCompatInit();
|
||||
if (isWindows) {
|
||||
term.winptyCompatInit();
|
||||
}
|
||||
// term.webLinksInit();
|
||||
term.fit();
|
||||
term.focus();
|
||||
|
||||
Reference in New Issue
Block a user