Skip to content

Commit

Permalink
Merge branch 'master' into guard_selection_api
Browse files Browse the repository at this point in the history
  • Loading branch information
Tyriar committed Jul 14, 2017
2 parents 6df6aad + 1fd087e commit e2b43a4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
12 changes: 0 additions & 12 deletions src/SelectionManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,6 @@ const DRAG_SCROLL_MAX_SPEED = 15;
*/
const DRAG_SCROLL_INTERVAL = 50;

/**
* The amount of time before mousedown events are no longer stacked to create
* double/triple click events.
*/
const CLEAR_MOUSE_DOWN_TIME = 400;

/**
* The number of pixels in each direction that the mouse must move before
* mousedown events are no longer stacked to create double/triple click events.
*/
const CLEAR_MOUSE_DISTANCE = 10;

/**
* A string containing all characters that are considered word separated by the
* double click to select work logic.
Expand Down
5 changes: 5 additions & 0 deletions src/xterm.js
Original file line number Diff line number Diff line change
Expand Up @@ -2238,6 +2238,11 @@ Terminal.prototype.handler = function(data) {
return;
}

// Clear the selection if the selection manager is available and has an active selection
if (this.selectionManager && this.selectionManager.hasSelection) {
this.selectionManager.clearSelection();
}

// Input is being sent to the terminal, the terminal should focus the prompt.
if (this.ybase !== this.ydisp) {
this.scrollToBottom();
Expand Down

0 comments on commit e2b43a4

Please sign in to comment.