Merge remote-tracking branch 'origin/master' into 1364_addon_lint

.gitignore

@@ -15,6 +15,7 @@ build/
 .vscode/
 .DS_Store
 fixtures/typings-test/*.js
+package-lock.json
 
 # Directories needed for code coverage
 /coverage/

.npmrc

@@ -0,0 +1 @@
+package-lock=false

AUTHORS

@@ -5,6 +5,7 @@ Aleksandr Andrienko <aandrienko@codenvy.com>
 Aleksandr Andriienko <oandriie@redhat.com>
 Alessandro Nadalin <alessandro.nadalin@gmail.com>
 Alexander Olsson <noseglid@gmail.com>
+Alexandre Petit-Pas <petitpasalexandre@gmail.com>
 Alexey Kontsevoy <alexey@gravitational.com>
 Andres Mejia <amejia004@gmail.com>
 Anish Athalye <me@anishathalye.com>
@@ -18,6 +19,7 @@ Austin Robertson <austinrobertson@gmail.com>
 ayapi <colors.aya@gmail.com>
 Ben Hall <ben@benhall.me.uk>
 Benjamin Fischer <benjamin.fischer@rwth-aachen.de>
+Benjamin Woodruff <github@benjam.info>
 Bill Church <billchurch@users.noreply.github.com>
 Bob Reid <bobreid@Bobs-MacBook-Pro.local>
 bottleofwater <nison.mael+bottleofwater@gmail.com>
@@ -44,6 +46,7 @@ Edgar Andrés Margffoy Tuay <andfoy@gmail.com>
 Elliot Saba <staticfloat@gmail.com>
 Exile <exile@chamber.ee>
 Felipe Gasper <felipe@felipegasper.com>
+Felix <30559812+felixse@users.noreply.github.com>
 ficristo <ficristo.work@gmail.com>
 Gary Ritchie <gary@rstudio.com>
 hiro-su <h.sugipon@gmail.com>
@@ -70,6 +73,7 @@ Lucian Buzzo <lucian.buzzo@gmail.com>
 Lukas Drgon <lukas.drgon@gmail.com>
 Maël Nison <nison.mael@gmail.com>
 Marc Dumais <marc.dumais@ericsson.com>
+Marek Libra <mlibra@redhat.com>
 Markus F.X.J. Oberhumer <markus@oberhumer.com>
 Martin Chloride <i@martincl2.me>
 Martin Koppehel <martin.koppehel@st.ovgu.de>
@@ -85,6 +89,7 @@ Oleksandr Andriienko <oandriie@redhat.com>
 Paris Kasidiaris <pariskasidiaris@gmail.com>
 Paris Kasidiaris <paris@sourcelair.com>
 Peter Baumgarten <me@peterbaumgarten.com>
+Philip Olson <philip.olson@protonmail.ch>
 Rick Baker <rick@ricktbaker.com>
 runarberg <runar@greenqloud.com>
 Saad Malik <simfox3@gmail.com>

demo/zmodem/app.js

@@ -7,16 +7,16 @@ var pty = require('node-pty');
 var terminals = {},
     logs = {};
 
-app.use('/build', express.static(__dirname + '/../../../../build'));
-app.use('/demo', express.static(__dirname + '/../../../../demo'));
-app.use('/zmodemjs', express.static(__dirname + '/../../../../node_modules/zmodem.js/dist'));
+app.use('/build', express.static(__dirname + '/../../build'));
+app.use('/demo', express.static(__dirname + '/../../demo'));
+app.use('/zmodemjs', express.static(__dirname + '/../../node_modules/zmodem.js/dist'));
 
 app.get('/', function(req, res){
   res.sendFile(__dirname + '/index.html');
 });
 
 app.get('/style.css', function(req, res){
-  res.sendFile(__dirname + '/style.css');
+  res.sendFile(__dirname + '../style.css');
 });
 
 app.get('/main.js', function(req, res){

demo/zmodem/main.js

@@ -6,6 +6,11 @@ var term,
     socket,
     pid;
 
+Terminal.applyAddon(fit);
+Terminal.applyAddon(attach);
+Terminal.applyAddon(zmodem);
+Terminal.applyAddon(search);
+
 var terminalContainer = document.getElementById('terminal-container'),
     actionElements = {
       findNext: document.querySelector('#find-next'),

jsdoc.json

@@ -1,26 +0,0 @@
-{
-  "source": {
-    "include": [
-      "src/"
-    ],
-    "exclude": [
-      "src/test/"
-    ],
-    "excludePattern": "src/.+\\.test\\.(js|ts)$"
-  },
-  "opts": {
-    "readme": "README.md",
-    "template": "node_modules/docdash",
-    "encoding": "utf8",
-    "destination": "docs/",
-    "recurse": true,
-    "verbose": true
-  },
-  "plugins": [
-    "plugins/markdown"
-  ],
-  "templates": {
-    "cleverLinks": false,
-    "monospaceLinks": false
-  }
-}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "xterm",
   "description": "Full xterm terminal, in your browser",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "ignore": [
     "demo",
     "test",
@@ -46,7 +46,6 @@
     "@types/text-encoding": "0.0.32",
     "browserify": "^13.3.0",
     "chai": "3.5.0",
-    "docdash": "0.4.0",
     "express": "4.13.4",
     "express-ws": "2.0.0-rc.1",
     "fs-extra": "^1.0.0",
@@ -65,6 +64,7 @@
     "merge-stream": "^1.0.1",
     "node-pty": "^0.7.2",
     "nodemon": "1.10.2",
+    "npm-run-all": "^4.1.2",
     "sorcery": "^0.10.0",
     "tslint": "^5.9.1",
     "typescript": "~2.7.1",
@@ -76,10 +76,10 @@
   },
   "scripts": {
     "start": "node demo/app",
-    "prestart-zmodem": "npm run build",
-    "start-zmodem": "node build/addons/zmodem/demo/app",
+    "start-zmodem": "node demo/zmodem/app",
     "lint": "tslint src/*.ts src/**/*.ts src/addons/**/*.ts",
-    "test": "gulp test",
+    "test": "npm-run-all mocha lint",
+    "mocha": "gulp test",
     "build:docs": "jsdoc -c jsdoc.json",
     "tsc": "tsc",
     "build": "gulp build",

src/Terminal.ts

@@ -1927,7 +1927,7 @@ export class Terminal extends EventEmitter implements ITerminal, IInputHandlingT
 
     if (x === this.cols && y === this.rows) {
       // Check if we still need to measure the char size (fixes #785).
-      if (!this.charMeasure.width || !this.charMeasure.height) {
+      if (this.charMeasure && (!this.charMeasure.width || !this.charMeasure.height)) {
         this.charMeasure.measure(this.options);
       }
       return;
@@ -2169,7 +2169,9 @@ export class Terminal extends EventEmitter implements ITerminal, IInputHandlingT
     this._customKeyEventHandler = customKeyEventHandler;
     this._inputHandler = inputHandler;
     this.refresh(0, this.rows - 1);
-    this.viewport.syncScrollArea();
+    if (this.viewport) {
+      this.viewport.syncScrollArea();
+    }
   }
 
 

src/addons/zmodem/zmodem.ts

@@ -38,11 +38,13 @@ import { Terminal } from 'xterm';
 
 let zmodem;
 
-export interface IZModemOptions {
+export interface IZmodemOptions {
   noTerminalWriteOutsideSession?: boolean;
 }
 
-export function zmodemAttach(term: Terminal, ws: WebSocket, opts: IZModemOptions = {}): void {
+function zmodemAttach(ws: WebSocket, opts: IZmodemOptions = {}): void {
+  var term = this;
+
   const senderFunc = (octets: ArrayLike<number>) => ws.send(new Uint8Array(octets));
 
   let zsentry;
@@ -85,8 +87,8 @@ export function zmodemAttach(term: Terminal, ws: WebSocket, opts: IZModemOptions
 }
 
 export function apply(terminalConstructor: typeof Terminal): void {
-  zmodem = (typeof window === 'object') ? (<any>window).ZModem : {Browser: null};  // Nullify browser for tests
+  zmodem = (typeof window === 'object') ? (<any>window).Zmodem : {Browser: null};  // Nullify browser for tests
 
-  (<any>terminalConstructor.prototype).zmodemAttach = zmodemAttach.bind(this, this);
+  (<any>terminalConstructor.prototype).zmodemAttach = zmodemAttach;
   (<any>terminalConstructor.prototype).zmodemBrowser = zmodem.Browser;
 }