Merge branch 'terminal-fix' into 'master'

Terminal: Add TextEncoder and TextDecoder in terminal bundle. Closes #25977 See merge request !8450

Merge branch 'terminal-fix' into 'master'
80c9a1a0 · Jacob Schatz · 7c2a4699 · 232f7fd9 · 80c9a1a0 · 80c9a1a0
Commit 80c9a1a0 authored Jan 04, 2017 by Jacob Schatz
3 changed files
--- a/app/assets/javascripts/terminal/terminal_bundle.js.es6
+++ b/app/assets/javascripts/terminal/terminal_bundle.js.es6
+//= require xterm/encoding-indexes
+//= require xterm/encoding
 //= require xterm/xterm.js
 //= require xterm/fit.js
 //= require ./terminal.js

--- a/vendor/assets/javascripts/xterm/encoding-indexes.js
+++ b/vendor/assets/javascripts/xterm/encoding-indexes.js
--- a/vendor/assets/javascripts/xterm/encoding.js
+++ b/vendor/assets/javascripts/xterm/encoding.js