diff --git a/app/components/containerConsole/containerConsoleController.js b/app/components/containerConsole/containerConsoleController.js index 14469cc05..9a221f365 100644 --- a/app/components/containerConsole/containerConsoleController.js +++ b/app/components/containerConsole/containerConsoleController.js @@ -5,7 +5,7 @@ function ($scope, $stateParams, Container, Image, Exec, $timeout, EndpointProvid $scope.state.loaded = false; $scope.state.connected = false; $scope.formValues = {}; - + var socket, term; // Ensure the socket is closed before leaving the view @@ -40,7 +40,7 @@ function ($scope, $stateParams, Container, Image, Exec, $timeout, EndpointProvid $('#loadConsoleSpinner').show(); var termWidth = Math.round($('#terminal-container').width() / 8.2); var termHeight = 30; - var command = $scope.formValues.isCustomCommand ? + var command = $scope.formValues.isCustomCommand ? $scope.formValues.customCommand : $scope.formValues.command; var execConfig = { id: $stateParams.id, @@ -107,7 +107,7 @@ function ($scope, $stateParams, Container, Image, Exec, $timeout, EndpointProvid term.on('data', function (data) { socket.send(data); }); - term.open(document.getElementById('terminal-container')); + term.open(document.getElementById('terminal-container'), true); term.resize(width, height); term.setOption('cursorBlink', true); diff --git a/bower.json b/bower.json index 3c5b32df4..ab0ebcc00 100644 --- a/bower.json +++ b/bower.json @@ -43,13 +43,13 @@ "lodash": "4.12.0", "rdash-ui": "1.0.*", "moment": "~2.14.1", - "xterm.js": "~2.0.1", "font-awesome": "~4.7.0", "ng-file-upload": "~12.2.13", "splitargs": "~0.2.0", "bootbox.js": "bootbox#^4.4.0", "angular-multi-select": "~4.0.0", - "toastr": "~2.1.3" + "toastr": "~2.1.3", + "xterm.js": "~2.8.1" }, "resolutions": { "angular": "1.5.11"