]> git.proxmox.com Git - pve-xtermjs.git/commitdiff
projects / pve-xtermjs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e264b12)
adapt main.js to upstream xterm.js changes
authorDominik Csapak <d.csapak@proxmox.com>
Tue, 21 Jan 2020 14:38:28 +0000 (15:38 +0100)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Wed, 22 Jan 2020 11:16:43 +0000 (12:16 +0100)
Addon loading/usage changed
event listener interface changed ('on' to 'onResize', 'onData', etc.)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
src/www/Makefile patch | blob | blame | history
src/www/index.html.tpl.in patch | blob | blame | history
src/www/main.js patch | blob | blame | history

diff --git a/src/www/Makefile b/src/www/Makefile
index a9effb03cfe0c41e4a877c16edb3ce1667b5941f..5e51258b4bf0f67b6d07a0d29dea7ae7beb4c69e 100644 (file)
--- a/src/www/Makefile
+++ b/src/www/Makefile
@@ -1,7 +1,8 @@
 WWWBASEDIR=${DESTDIR}/usr/share/pve-xtermjs
 
 SOURCE = \
-       addons/fit/fit.js \
+       xterm-addon-fit.js \
+       xterm-addon-fit.js.map \
        index.html.tpl \
        main.js \
        style.css \
diff --git a/src/www/index.html.tpl.in b/src/www/index.html.tpl.in
index 8cc74edeedeba1191c1e42359fea3561d917f694..5002035c3d51d36860cb8b779533169e1b5004dc 100644 (file)
--- a/src/www/index.html.tpl.in
+++ b/src/www/index.html.tpl.in
@@ -5,7 +5,7 @@
        <link rel="stylesheet" href="/xtermjs/xterm.css?version=@VERSION@" />
        <link rel="stylesheet" href="/xtermjs/style.css?version=@VERSION@" />
        <script src="/xtermjs/xterm.js?version=@VERSION@" ></script>
-       <script src="/xtermjs/fit.js?version=@VERSION@" ></script>
+       <script src="/xtermjs/xterm-addon-fit.js?version=@VERSION@" ></script>
        <script src="/xtermjs/util.js?version=@VERSION@" ></script>
     </head>
     <body>
diff --git a/src/www/main.js b/src/www/main.js
index 6a1dba392f7d579e1bd857fae906688d842aba6b..6d7ee69bcb5b252ab0ecb0bda05c2297373de4a8 100644 (file)
--- a/src/www/main.js
+++ b/src/www/main.js
@@ -85,14 +85,15 @@ function updateState(newState, msg) {
 
 var terminalContainer = document.getElementById('terminal-container');
 document.getElementById('status_bar').addEventListener('click', hideMsg);
-Terminal.applyAddon(fit);
+const fitAddon = new FitAddon.FitAddon();
 
 createTerminal();
 
 function createTerminal() {
     term = new Terminal(getTerminalSettings());
+    term.loadAddon(fitAddon);
 
-    term.on('resize', function (size) {
+    term.onResize(function (size) {
        if (state === states.connected) {
            socket.send("1:" + size.cols + ":" + size.rows + ":");
        }
@@ -156,7 +157,7 @@ function runTerminal() {
        }
     };
 
-    term.on('data', function(data) {
+    term.onData(function(data) {
        if (state === states.connected) {
            socket.send("0:" + unescape(encodeURIComponent(data)).length.toString() + ":" +  data);
        }
@@ -170,7 +171,7 @@ function runTerminal() {
        clearTimeout(resize);
        resize = setTimeout(function() {
            // done resizing
-           term.fit();
+           fitAddon.fit();
        }, 250);
     });
 
@@ -179,7 +180,7 @@ function runTerminal() {
     // initial focus and resize
     setTimeout(function() {
        term.focus();
-       term.fit();
+       fitAddon.fit();
     }, 250);
 }
 
@@ -286,10 +287,14 @@ function tryReconnect() {
     setTimeout(checkMigration, 5000);
 }
 
+function clearEvents() {
+    term.onResize(() => {});
+    term.onData(() => {});
+}
+
 function stopTerminal(event) {
     event = event || {};
-    term.off('resize');
-    term.off('data');
+    clearEvents();
     clearInterval(ping);
     socket.close();
     updateState(states.disconnected, event.msg + event.code);
@@ -297,8 +302,7 @@ function stopTerminal(event) {
 
 function errorTerminal(event) {
     even = event || {};
-    term.off('resize');
-    term.off('data');
+    clearEvents();
     clearInterval(ping);
     socket.close();
     term.dispose();
xterm.js webclient