github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor(xterm): update xtermjs to latest version (#1692)

pull/1701/head
Anthony Lapenna 2018-03-06 17:40:02 +10:00 committed by GitHub
parent 1ae9832980
commit a76ccff7c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/config.js
View File

@ -26,6 +26,8 @@ angular.module('portainer')
toastr.options.timeOut = 3000; toastr.options.timeOut = 3000;
Terminal.applyAddon(fit);
$uibTooltipProvider.setTriggers({ $uibTooltipProvider.setTriggers({
'mouseenter': 'mouseleave', 'mouseenter': 'mouseleave',
'click': 'click', 'click': 'click',

3
app/docker/views/containers/console/containerConsoleController.js
View File

@ -87,7 +87,8 @@ function ($scope, $transition$, Container, Image, EndpointProvider, Notification
term.on('data', function (data) { term.on('data', function (data) {
socket.send(data); socket.send(data);
}); });
term.open(document.getElementById('terminal-container'), true); term.open(document.getElementById('terminal-container'));
term.focus();
term.resize(width, height); term.resize(width, height);
term.setOption('cursorBlink', true); term.setOption('cursorBlink', true);
term.fit(); term.fit();

2
package.json
View File

@ -56,7 +56,7 @@
"splitargs": "github:deviantony/splitargs#~0.2.0", "splitargs": "github:deviantony/splitargs#~0.2.0",
"toastr": "github:CodeSeven/toastr#~2.1.3", "toastr": "github:CodeSeven/toastr#~2.1.3",
"ui-select": "~0.19.6", "ui-select": "~0.19.6",
"xterm": "~2.8.1" "xterm": "^3.1.0"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^7.1.1", "autoprefixer": "^7.1.1",

6
yarn.lock
View File

@ -4483,9 +4483,9 @@ xtend@~3.0.0:
version "3.0.0" version "3.0.0"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a" resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a"
xterm@~2.8.1: xterm@^3.1.0:
version "2.8.1" version "3.1.0"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-2.8.1.tgz#3f6b939bcb8d015a1f247d66257102cb16a0b2e1" resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.1.0.tgz#7f7e1c8cf4b80bd881a4e8891213b851423e90c9"
yargs@~3.10.0: yargs@~3.10.0:
version "3.10.0" version "3.10.0"