Merge pull request #19 from coolreader18/xtermv4

Update to work with xtermjs 4

Author: wavesoft

README.md

@@ -43,8 +43,11 @@ The local echo controller tries to replicate most of the bash-like user experien
     const term = new Terminal();
     term.open(document.getElementById('terminal'));
 
-    // Create a local echo controller
+    // Create a local echo controller (xterm.js v3)
     const localEcho = new LocalEchoController(term);
+    // Create a local echo controller (xterm.js >=v4)
+    const localEcho = new LocalEchoController();
+    term.loadAddon(localEcho);
 
     // Read a single line from the user
     localEcho.read("~$ ")
@@ -68,8 +71,11 @@ The local echo controller tries to replicate most of the bash-like user experien
     const term = new Terminal();
     term.open(document.getElementById('terminal'));
 
-    // Create a local echo controller
+    // Create a local echo controller (xterm.js v3)
     const localEcho = new LocalEchoController(term);
+    // Create a local echo controller (xterm.js >=v4)
+    const localEcho = new LocalEchoController();
+    term.loadAddon(localEcho);
 
     // Read a single line from the user
     localEcho.read("~$ ")

lib/LocalEchoController.js

@@ -23,7 +23,7 @@ import {
  * - Auto-complete hooks
  */
 export default class LocalEchoController {
-  constructor(term, options = {}) {
+  constructor(term = null, options = {}) {
     this.term = term;
     this._handleTermData = this.handleTermData.bind(this);
     this._handleTermResize = this.handleTermResize.bind(this)
@@ -38,11 +38,25 @@ export default class LocalEchoController {
     this._activePrompt = null;
     this._activeCharPrompt = null;
     this._termSize = {
-      cols: this.term.cols,
-      rows: this.term.rows
+      cols: 0,
+      rows: 0,
     };
+
+    this._disposables = [];
 
-    this.attach()
+    if (term) {
+      if (term.loadAddon) term.loadAddon(this);
+      else this.attach();
+    }
+  }
+
+  // xterm.js new plugin API:
+  activate(term) {
+    this.term = term;
+    this.attach();
+  }
+  dispose() {
+    this.detach();
   }
 
   /////////////////////////////////////////////////////////////////////////////
@@ -53,16 +67,30 @@ export default class LocalEchoController {
    *  Detach the controller from the terminal
    */
   detach() {
-    this.term.off("data", this._handleTermData);
-    this.term.off("resize", this._handleTermResize);
+    if (this.term.off) {
+      this.term.off("data", this._handleTermData);
+      this.term.off("resize", this._handleTermResize);
+    } else {
+      this._disposables.forEach(d => d.dispose());
+      this._disposables = [];
+    }
   }
 
   /**
    * Attach controller to the terminal, handling events
    */
   attach() {
-    this.term.on("data", this._handleTermData);
-    this.term.on("resize", this._handleTermResize);
+    if (this.term.on) {
+      this.term.on("data", this._handleTermData);
+      this.term.on("resize", this._handleTermResize);
+    } else {
+      this._disposables.push(this.term.onData(this._handleTermData));
+      this._disposables.push(this.term.onResize(this._handleTermResize));
+    }
+    this._termSize = {
+      cols: this.term.cols,
+      rows: this.term.rows,
+    };
   }
 
   /**