Merge branch 'master' into feature-778

This commit is contained in:
Daniel Imms
2018-01-05 11:03:33 -08:00
committed by GitHub
63 changed files with 1855 additions and 911 deletions
+5 -1
View File
@@ -288,6 +288,7 @@ export class SelectionManager extends EventEmitter implements ISelectionManager
public selectAll(): void {
this._model.isSelectAllActive = true;
this.refresh();
this._terminal.emit('selection');
}
/**
@@ -560,7 +561,7 @@ export class SelectionManager extends EventEmitter implements ISelectionManager
this._terminal.scrollLines(this._dragScrollAmount, false);
// Re-evaluate selection
if (this._dragScrollAmount > 0) {
this._model.selectionEnd = [this._terminal.cols - 1, this._terminal.buffer.ydisp + this._terminal.rows];
this._model.selectionEnd = [this._terminal.cols - 1, Math.min(this._terminal.buffer.ydisp + this._terminal.rows, this._terminal.buffer.lines.length - 1)];
} else {
this._model.selectionEnd = [0, this._terminal.buffer.ydisp];
}
@@ -574,6 +575,9 @@ export class SelectionManager extends EventEmitter implements ISelectionManager
*/
private _onMouseUp(event: MouseEvent): void {
this._removeMouseDownListeners();
if (this.hasSelection)
this._terminal.emit('selection');
}
/**