From cf5c3ee5366d35da7dbe9be626e4705cc01df312 Mon Sep 17 00:00:00 2001
From: Liam Cottam <killtheidols@hotmail.co.uk>
Date: Fri, 4 Aug 2017 07:02:26 +0100
Subject: [PATCH] fix(container-console): fix an issue with scrollbar (#932)
 (#1086)

---
 .../containerConsole/containerConsoleController.js         | 7 ++++++-
 vendor.yml                                                 | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/components/containerConsole/containerConsoleController.js b/app/components/containerConsole/containerConsoleController.js
index 2ff1214ad..aa37611f4 100644
--- a/app/components/containerConsole/containerConsoleController.js
+++ b/app/components/containerConsole/containerConsoleController.js
@@ -38,7 +38,7 @@ function ($scope, $stateParams, Container, Image, EndpointProvider, Notification
 
   $scope.connect = function() {
     $('#loadConsoleSpinner').show();
-    var termWidth = Math.round($('#terminal-container').width() / 8.2);
+    var termWidth = Math.floor(($('#terminal-container').width() - 20) / 8.39);
     var termHeight = 30;
     var command = $scope.formValues.isCustomCommand ?
                     $scope.formValues.customCommand : $scope.formValues.command;
@@ -97,6 +97,11 @@ function ($scope, $stateParams, Container, Image, EndpointProvider, Notification
       term.open(document.getElementById('terminal-container'), true);
       term.resize(width, height);
       term.setOption('cursorBlink', true);
+      term.fit();
+
+      window.onresize = function() {
+        term.fit();
+      };
 
       socket.onmessage = function (e) {
         term.write(e.data);
diff --git a/vendor.yml b/vendor.yml
index d2c3bac42..4c1e83937 100644
--- a/vendor.yml
+++ b/vendor.yml
@@ -12,6 +12,7 @@ js:
   - bower_components/splitargs/src/splitargs.js
   - bower_components/toastr/toastr.js
   - bower_components/xterm.js/dist/xterm.js
+  - bower_components/xterm.js/dist/addons/fit/fit.js
   - assets/js/legend.js
   minified:
   - bower_components/jquery/dist/jquery.min.js
@@ -25,6 +26,7 @@ js:
   - bower_components/splitargs/src/splitargs.js
   - bower_components/toastr/toastr.min.js
   - bower_components/xterm.js/dist/xterm.js
+  - bower_components/xterm.js/dist/addons/fit/fit.js
   - assets/js/legend.js
 css:
   regular: