Merge branch 'master' into pr/jerch/1878

2019-03-31 23:34:46 -07:00
parent ba9ed43acd b05c66b132
commit 69f8700557
39 changed files with 256 additions and 851 deletions
@@ -1271,7 +1271,9 @@ export class InputHandler extends Disposable implements IInputHandler {
          if (this._terminal.element) {
            this._terminal.element.classList.add('enable-mouse-events');
          }
-          this._terminal.selectionManager.disable();
+          if (this._terminal.selectionManager) {
+            this._terminal.selectionManager.disable();
+          }
          this._terminal.log('Binding to mouse events.');
          break;
        case 1004: // send focusin/focusout events
@@ -1461,7 +1463,9 @@ export class InputHandler extends Disposable implements IInputHandler {
          if (this._terminal.element) {
            this._terminal.element.classList.remove('enable-mouse-events');
          }
-          this._terminal.selectionManager.enable();
+          if (this._terminal.selectionManager) {
+            this._terminal.selectionManager.enable();
+          }
          break;
        case 1004: // send focusin/focusout events
          this._terminal.sendFocus = false;