summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/terminal
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2016-11-03 16:38:54 -0500
committerMike Greiling <mike@pixelcog.com>2017-01-10 12:30:38 -0600
commitfe964cc235ed22a5d013d5874284763b698aba7c (patch)
tree5529dd7d9deb13d511d37f7a8fed33de15aa6d7c /app/assets/javascripts/terminal
parent55f291e8ceae6d3d432039f72f6935c62fb2a872 (diff)
downloadgitlab-ce-fe964cc235ed22a5d013d5874284763b698aba7c.tar.gz
migrate all javascript asset bundles and require syntax
Diffstat (limited to 'app/assets/javascripts/terminal')
-rw-r--r--app/assets/javascripts/terminal/terminal_bundle.js.es610
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/terminal/terminal_bundle.js.es6 b/app/assets/javascripts/terminal/terminal_bundle.js.es6
index 33d2c1e1a17..13cf3a10a38 100644
--- a/app/assets/javascripts/terminal/terminal_bundle.js.es6
+++ b/app/assets/javascripts/terminal/terminal_bundle.js.es6
@@ -1,7 +1,7 @@
-//= require xterm/encoding-indexes
-//= require xterm/encoding
-//= require xterm/xterm.js
-//= require xterm/fit.js
-//= require ./terminal.js
+require('vendor/xterm/encoding-indexes.js');
+require('vendor/xterm/encoding.js');
+window.Terminal = require('vendor/xterm/xterm.js');
+require('vendor/xterm/fit.js');
+require('./terminal.js');
$(() => new gl.Terminal({ selector: '#terminal' }));