diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-01-14 10:36:02 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-01-14 10:36:02 +0000 |
| commit | df7fe63711dd123eb9dfb78ffc8de4d446c1f4ca (patch) | |
| tree | 999f52d11f644e158606e53d5e0e487c081f8b0d | |
| parent | 08a320aac554fe64fb3d7c75104d669d36f8cdb9 (diff) | |
| parent | 7df39921f06023bf3481fe84c9ae90968fdf61e0 (diff) | |
| download | gitlab-ce-55801-support-alerts-from-external-prometheus-servers.tar.gz | |
Merge branch 'web-terminal_xterm_weblinks' into 'master'55801-support-alerts-from-external-prometheus-servers
web-terminal: Add support for URL to Link parsing
See merge request gitlab-org/gitlab-ce!24242
| -rw-r--r-- | app/assets/javascripts/terminal/terminal.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/terminal/terminal.js b/app/assets/javascripts/terminal/terminal.js index 560f50ebf8f..e5dd7a465ea 100644 --- a/app/assets/javascripts/terminal/terminal.js +++ b/app/assets/javascripts/terminal/terminal.js @@ -2,11 +2,13 @@ import _ from 'underscore'; import $ from 'jquery'; import { Terminal } from 'xterm'; 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'; const SCROLL_MARGIN = 5; Terminal.applyAddon(fit); +Terminal.applyAddon(webLinks); export default class GLTerminal { constructor(element, options = {}) { @@ -48,6 +50,7 @@ export default class GLTerminal { this.terminal.open(this.container); this.terminal.fit(); + this.terminal.webLinksInit(); this.terminal.focus(); this.socket.onopen = () => { |