diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-10-11 21:18:05 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-11 21:18:05 +0300 |
| commit | a44ab2e400af81ce98f9822b9ac0d31ce1de56d1 (patch) | |
| tree | 8c2130ca85930756b4c728808be375aa7a3daa29 | |
| parent | 48ada1f74463e64257955f24a8cf2d1ec3eb427d (diff) | |
| download | gitlab-ce-a44ab2e400af81ce98f9822b9ac0d31ce1de56d1.tar.gz | |
Add project path as a data attribute and use it in gl.Terminal.
| -rw-r--r-- | app/assets/javascripts/terminal/terminal.js.es6 | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/terminal/terminal_bundle.js.es6 | 2 | ||||
| -rw-r--r-- | app/views/projects/deployments/terminal.html.haml | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/terminal/terminal.js.es6 b/app/assets/javascripts/terminal/terminal.js.es6 index 67435aa3db0..d1bbab64b2c 100644 --- a/app/assets/javascripts/terminal/terminal.js.es6 +++ b/app/assets/javascripts/terminal/terminal.js.es6 @@ -18,8 +18,9 @@ gl.Terminal = class { setSocketUrl() { const {protocol, hostname, port} = window.location; const wsProtocol = protocol === 'https:' ? 'wss://' : 'ws://'; + const path = this.container.dataset.projectPath; - this.socketUrl = `${wsProtocol}${hostname}:${port}/gitlab-org/gitlab-ce/deployments/4/terminal_websocket` + this.socketUrl = `${wsProtocol}${hostname}:${port}${path}/deployments/4/terminal_websocket` } createTerminal() { diff --git a/app/assets/javascripts/terminal/terminal_bundle.js.es6 b/app/assets/javascripts/terminal/terminal_bundle.js.es6 index fa476221a02..f451548abf7 100644 --- a/app/assets/javascripts/terminal/terminal_bundle.js.es6 +++ b/app/assets/javascripts/terminal/terminal_bundle.js.es6 @@ -3,7 +3,7 @@ //= require ./xterm/fit.js //= require ./terminal.js -$(function() { +$(() => { new gl.Terminal({ selector: '#terminal' }); diff --git a/app/views/projects/deployments/terminal.html.haml b/app/views/projects/deployments/terminal.html.haml index 26ef7f06797..7384efa4899 100644 --- a/app/views/projects/deployments/terminal.html.haml +++ b/app/views/projects/deployments/terminal.html.haml @@ -9,10 +9,10 @@ - content_for :page_specific_javascripts do = page_specific_javascript_tag("terminal/terminal_bundle.js") - .terminal-container{ class: container_class } + .terminal-container{class: container_class} %p.content-block Environment: %a{href: '#'} add information - #terminal + #terminal{data:{project_path: project_path(@project)}} |