From 134416c9a33d89eb342c2456bc0302a186a2c57e Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <lapenna.anthony@gmail.com>
Date: Fri, 7 Oct 2016 17:19:25 +1300
Subject: [PATCH] fix(container-console): use xterm.js v2 (#262)

---
 .../containerConsole/containerConsoleController.js     | 10 +++-------
 bower.json                                             |  2 +-
 gruntFile.js                                           |  4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/components/containerConsole/containerConsoleController.js b/app/components/containerConsole/containerConsoleController.js
index 3f1bcd757..c02a0a84c 100644
--- a/app/components/containerConsole/containerConsoleController.js
+++ b/app/components/containerConsole/containerConsoleController.js
@@ -82,16 +82,14 @@ function ($scope, $stateParams, Settings, Container, Exec, $timeout, Messages) {
     $scope.connected = true;
     socket.onopen = function(evt) {
       $('#loadConsoleSpinner').hide();
-      term = new Terminal({
-        cols: width,
-        rows: height,
-        cursorBlink: true
-      });
+      term = new Terminal();
 
       term.on('data', function (data) {
         socket.send(data);
       });
       term.open(document.getElementById('terminal-container'));
+      term.resize(width, height);
+      term.setOption('cursorBlink', true);
 
       socket.onmessage = function (e) {
         term.write(e.data);
@@ -102,8 +100,6 @@ function ($scope, $stateParams, Settings, Container, Exec, $timeout, Messages) {
       };
       socket.onclose = function(evt) {
         $scope.connected = false;
-        // term.write("Session terminated");
-        // term.destroy();
       };
     };
   }
diff --git a/bower.json b/bower.json
index 0e811c6fb..35adee30f 100644
--- a/bower.json
+++ b/bower.json
@@ -41,7 +41,7 @@
     "lodash": "4.12.0",
     "rdash-ui": "1.0.*",
     "moment": "~2.14.1",
-    "xterm.js": "~1.1.3"
+    "xterm.js": "~2.0.1"
   },
   "resolutions": {
     "angular": "1.5.5"
diff --git a/gruntFile.js b/gruntFile.js
index f1e4db93b..ff3acd980 100644
--- a/gruntFile.js
+++ b/gruntFile.js
@@ -73,7 +73,7 @@ module.exports = function (grunt) {
                 'bower_components/lodash/dist/lodash.min.js',
                 'bower_components/filesize/lib/filesize.min.js',
                 'bower_components/moment/min/moment.min.js',
-                'bower_components/xterm.js/src/xterm.js',
+                'bower_components/xterm.js/dist/xterm.js',
                 'assets/js/jquery.gritter.js', // Using custom version to fix error in minified build due to "use strict"
                 'assets/js/legend.js' // Not a bower package
             ],
@@ -88,7 +88,7 @@ module.exports = function (grunt) {
                 'bower_components/font-awesome/css/font-awesome.min.css',
                 'bower_components/rdash-ui/dist/css/rdash.min.css',
                 'bower_components/angular-ui-select/dist/select.min.css',
-                'bower_components/xterm.js/src/xterm.css',
+                'bower_components/xterm.js/dist/xterm.css',
                 'bower_components/Hover/css/hover-min.css'
             ]
         },