Merge branch 'master' into guard_selection_api

This commit is contained in:
Daniel Imms
2017-07-14 09:51:58 -07:00
committed by GitHub
2 changed files with 5 additions and 12 deletions
-12
View File
@@ -27,18 +27,6 @@ const DRAG_SCROLL_MAX_SPEED = 15;
*/ */
const DRAG_SCROLL_INTERVAL = 50; 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 * A string containing all characters that are considered word separated by the
* double click to select work logic. * double click to select work logic.
+5
View File
@@ -2238,6 +2238,11 @@ Terminal.prototype.handler = function(data) {
return; 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. // Input is being sent to the terminal, the terminal should focus the prompt.
if (this.ybase !== this.ydisp) { if (this.ybase !== this.ydisp) {
this.scrollToBottom(); this.scrollToBottom();