Merge branch 'web-terminal_xterm_weblinks' into 'master'
web-terminal: Add support for URL to Link parsing See merge request gitlab-org/gitlab-ce!24242
This commit is contained in:
commit
df7fe63711
1 changed files with 3 additions and 0 deletions
|
@ -2,11 +2,13 @@ import _ from 'underscore';
|
||||||
import $ from 'jquery';
|
import $ from 'jquery';
|
||||||
import { Terminal } from 'xterm';
|
import { Terminal } from 'xterm';
|
||||||
import * as fit from 'xterm/lib/addons/fit/fit';
|
import * as fit from 'xterm/lib/addons/fit/fit';
|
||||||
|
import * as webLinks from 'xterm/lib/addons/webLinks/webLinks';
|
||||||
import { canScrollUp, canScrollDown } from '~/lib/utils/dom_utils';
|
import { canScrollUp, canScrollDown } from '~/lib/utils/dom_utils';
|
||||||
|
|
||||||
const SCROLL_MARGIN = 5;
|
const SCROLL_MARGIN = 5;
|
||||||
|
|
||||||
Terminal.applyAddon(fit);
|
Terminal.applyAddon(fit);
|
||||||
|
Terminal.applyAddon(webLinks);
|
||||||
|
|
||||||
export default class GLTerminal {
|
export default class GLTerminal {
|
||||||
constructor(element, options = {}) {
|
constructor(element, options = {}) {
|
||||||
|
@ -48,6 +50,7 @@ export default class GLTerminal {
|
||||||
|
|
||||||
this.terminal.open(this.container);
|
this.terminal.open(this.container);
|
||||||
this.terminal.fit();
|
this.terminal.fit();
|
||||||
|
this.terminal.webLinksInit();
|
||||||
this.terminal.focus();
|
this.terminal.focus();
|
||||||
|
|
||||||
this.socket.onopen = () => {
|
this.socket.onopen = () => {
|
||||||
|
|
Loading…
Reference in a new issue