Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-22 23:09:41 +02:00
Code Issues Releases Activity

chore(deps): update xtermjs version (#1012)

Browse source
This commit is contained in:
Anthony Lapenna 2017-07-11 16:52:39 +02:00 • committed by GitHub
parent bc4b0a0b35
commit 344eee098d
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/components/containerConsole/containerConsoleController.js
View file

@ -5,7 +5,7 @@ function ($scope, $stateParams, Container, Image, Exec, $timeout, EndpointProvid
$scope.state.loaded = false; $scope.state.loaded = false;
$scope.state.connected = false; $scope.state.connected = false;
$scope.formValues = {}; $scope.formValues = {};
var socket, term; var socket, term;
// Ensure the socket is closed before leaving the view // Ensure the socket is closed before leaving the view
@ -40,7 +40,7 @@ function ($scope, $stateParams, Container, Image, Exec, $timeout, EndpointProvid
$('#loadConsoleSpinner').show(); $('#loadConsoleSpinner').show();
var termWidth = Math.round($('#terminal-container').width() / 8.2); var termWidth = Math.round($('#terminal-container').width() / 8.2);
var termHeight = 30; var termHeight = 30;
var command = $scope.formValues.isCustomCommand ? var command = $scope.formValues.isCustomCommand ?
$scope.formValues.customCommand : $scope.formValues.command; $scope.formValues.customCommand : $scope.formValues.command;
var execConfig = { var execConfig = {
id: $stateParams.id, id: $stateParams.id,
@ -107,7 +107,7 @@ function ($scope, $stateParams, Container, Image, Exec, $timeout, EndpointProvid
term.on('data', function (data) { term.on('data', function (data) {
socket.send(data); socket.send(data);
}); });
term.open(document.getElementById('terminal-container')); term.open(document.getElementById('terminal-container'), true);
term.resize(width, height); term.resize(width, height);
term.setOption('cursorBlink', true); term.setOption('cursorBlink', true);

4
bower.json
View file

@ -43,13 +43,13 @@
"lodash": "4.12.0", "lodash": "4.12.0",
"rdash-ui": "1.0.*", "rdash-ui": "1.0.*",
"moment": "~2.14.1", "moment": "~2.14.1",
"xterm.js": "~2.0.1",
"font-awesome": "~4.7.0", "font-awesome": "~4.7.0",
"ng-file-upload": "~12.2.13", "ng-file-upload": "~12.2.13",
"splitargs": "~0.2.0", "splitargs": "~0.2.0",
"bootbox.js": "bootbox#^4.4.0", "bootbox.js": "bootbox#^4.4.0",
"angular-multi-select": "~4.0.0", "angular-multi-select": "~4.0.0",
"toastr": "~2.1.3" "toastr": "~2.1.3",
"xterm.js": "~2.8.1"
}, },
"resolutions": { "resolutions": {
"angular": "1.5.11" "angular": "1.5.11"