Small clean up

This commit is contained in:
Daniel Imms
2018-01-28 14:44:33 -08:00
parent 3bdc069f19
commit e8666cafc9
2 changed files with 22 additions and 23 deletions
+7 -1
View File
@@ -29,6 +29,12 @@ const DRAG_SCROLL_MAX_SPEED = 15;
*/
const DRAG_SCROLL_INTERVAL = 50;
/**
* The maximum amount of time that can have elapsed for an alt click to move the
* cursor.
*/
const ALT_CLICK_MOVE_CURSOR_TIME = 500;
/**
* A string containing all characters that are considered word separated by the
* double click to select work logic.
@@ -544,7 +550,7 @@ export class SelectionManager extends EventEmitter implements ISelectionManager
this._removeMouseDownListeners();
if (this.selectionText.length <= 1 && timeElapsed < 500) {
if (this.selectionText.length <= 1 && timeElapsed < ALT_CLICK_MOVE_CURSOR_TIME) {
(new AltClickHandler(event, this._terminal)).move();
} else if (this.hasSelection) {
this._terminal.emit('selection');
+15 -22
View File
@@ -20,7 +20,10 @@ export class AltClickHandler {
private _endCol: number;
private _lines: ICircularList<LineData>;
constructor(private _mouseEvent: MouseEvent, private _terminal: ITerminal) {
constructor(
private _mouseEvent: MouseEvent,
private _terminal: ITerminal
) {
this._lines = this._terminal.buffer.lines;
this._startCol = this._terminal.buffer.x;
this._startRow = this._terminal.buffer.y;
@@ -42,7 +45,9 @@ export class AltClickHandler {
* Writes the escape sequences of arrows to the terminal
*/
public move(): void {
if (this._mouseEvent.altKey) this._terminal.send(this._arrowSequences());
if (this._mouseEvent.altKey) {
this._terminal.send(this._arrowSequences());
}
}
/**
@@ -199,7 +204,8 @@ export class AltClickHandler {
startRow: number,
endCol: number,
endRow: number,
forward: boolean): string {
forward: boolean
): string {
let currentCol = startCol;
let currentRow = startRow;
let bufferStr = '';
@@ -233,36 +239,23 @@ export class AltClickHandler {
* Constructs the escape sequence for clicking an arrow
* @param direction The direction to move
*/
private _sequence(direction: Direction): string {
const mod = this._terminal.applicationCursor ? 'O' : '[';
return C0.ESC + mod + direction;
}
private _sequence(direction: Direction): string {
const mod = this._terminal.applicationCursor ? 'O' : '[';
return C0.ESC + mod + direction;
}
}
/**
* Returns a string repeated a given number of times
* Polyfill from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/repeat
* @param {Number} count The number of times to repeat the string
* @param {String} string The string that is to be repeated
* @param count The number of times to repeat the string
* @param string The string that is to be repeated
*/
function repeat(count: number, str: string): string {
if (count < 0) throw new RangeError('repeat count must be non-negative');
if (count === Infinity) throw new RangeError('repeat count must be less than infinity');
count = Math.floor(count);
if (str.length === 0 || count === 0) return '';
// Ensuring count is a 31-bit integer allows us to heavily optimize the
// main part. But anyway, most current (August 2014) browsers can't handle
// strings 1 << 28 chars or longer, so:
if (str.length * count >= 1 << 28) {
throw new RangeError('repeat count must not overflow maximum string size');
}
let rpt = '';
for (let i = 0; i < count; i++) {
rpt += str;
}
return rpt;
}