diff options
| author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-03-02 20:04:55 +0100 |
|---|---|---|
| committer | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-03-02 20:04:55 +0100 |
| commit | 8510fc8701344afdfc76e4df7f97b686175dae70 (patch) | |
| tree | 18400e0f57916e111af88ac1d13efc81d960768d | |
| parent | 98fecb5f8e64c4c64c96d065bc342d986140367e (diff) | |
| download | gitlab-ce-terminal-bundle-refactor.tar.gz | |
Removed terminal webpack bundle tagterminal-bundle-refactor
| -rw-r--r-- | app/assets/javascripts/pages/projects/environments/terminal/index.js | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/terminal/index.js (renamed from app/assets/javascripts/terminal/terminal_bundle.js) | 2 | ||||
| -rw-r--r-- | app/views/projects/environments/terminal.html.haml | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/pages/projects/environments/terminal/index.js b/app/assets/javascripts/pages/projects/environments/terminal/index.js new file mode 100644 index 00000000000..7129e24cee1 --- /dev/null +++ b/app/assets/javascripts/pages/projects/environments/terminal/index.js @@ -0,0 +1,3 @@ +import initTerminal from '~/terminal/'; + +document.addEventListener('DOMContentLoaded', initTerminal); diff --git a/app/assets/javascripts/terminal/terminal_bundle.js b/app/assets/javascripts/terminal/index.js index 134522ef961..1a75e072c4e 100644 --- a/app/assets/javascripts/terminal/terminal_bundle.js +++ b/app/assets/javascripts/terminal/index.js @@ -6,4 +6,4 @@ import './terminal'; window.Terminal = Terminal; -$(() => new gl.Terminal({ selector: '#terminal' })); +export default () => new gl.Terminal({ selector: '#terminal' }); diff --git a/app/views/projects/environments/terminal.html.haml b/app/views/projects/environments/terminal.html.haml index 7be4ef39117..6ec4ff56552 100644 --- a/app/views/projects/environments/terminal.html.haml +++ b/app/views/projects/environments/terminal.html.haml @@ -3,7 +3,6 @@ - content_for :page_specific_javascripts do = stylesheet_link_tag "xterm/xterm" - = webpack_bundle_tag("terminal") %div{ class: container_class } .top-area diff --git a/config/webpack.config.js b/config/webpack.config.js index 959cebe7487..0fedb6a8c72 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -45,7 +45,6 @@ function generateEntries() { const manualEntries = { monitoring: './monitoring/monitoring_bundle.js', mr_notes: './mr_notes/index.js', - terminal: './terminal/terminal_bundle.js', common: './commons/index.js', common_vue: './vue_shared/vue_resource_interceptor.js', |