Merge branch 'master' into 699_linux_middle_click

This commit is contained in:
Daniel Imms
2017-06-21 08:29:54 -07:00
committed by GitHub
2 changed files with 7 additions and 4 deletions
+4 -1
View File
@@ -192,11 +192,14 @@
position: absolute;
top: 0;
left: 0;
z-index: 1;
opacity: 0.3;
pointer-events: none;
}
.terminal .xterm-selection div {
position: absolute;
background-color: #555;
background-color: #fff;
}
/*
+3 -3
View File
@@ -539,8 +539,9 @@ Terminal.prototype.initGlobal = function() {
// Handle right click context menus
if (term.browser.isFirefox) {
// Firefox doesn't appear to fire the contextmenu event on right click
on(this.element, 'mousedown', event => {
if (ev.button == 2) {
if (event.button == 2) {
rightClickHandler(event, this.textarea, this.selectionManager);
}
});
@@ -661,8 +662,7 @@ Terminal.prototype.open = function(parent, focus) {
this.viewportScrollArea.classList.add('xterm-scroll-area');
this.viewportElement.appendChild(this.viewportScrollArea);
// Create the selection container. This needs to be added before the
// rowContainer as the selection must be below the text.
// Create the selection container.
this.selectionContainer = document.createElement('div');
this.selectionContainer.classList.add('xterm-selection');
this.element.appendChild(this.selectionContainer);