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

fix kubectl terminal not showing bottom line in some browser (#5444)

pull/4320/merge
Richard Wei 2021-08-23 14:23:07 +12:00 committed by GitHub
parent 80465367a5
commit 0ff9d49c6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/kubernetes/components/kubectl-shell/kubectl-shell.controller.js
View File

@ -39,6 +39,7 @@ export default class KubectlShellController {
} }
configureSocketAndTerminal(socket, term) { configureSocketAndTerminal(socket, term) {
var vm = this;
socket.onopen = function () { socket.onopen = function () {
const terminal_container = document.getElementById('terminal-container'); const terminal_container = document.getElementById('terminal-container');
term.open(terminal_container); term.open(terminal_container);
@ -55,7 +56,7 @@ export default class KubectlShellController {
}); });
this.$window.onresize = function () { this.$window.onresize = function () {
term.fit(); vm.TerminalWindow.terminalresize();
}; };
socket.onmessage = function (msg) { socket.onmessage = function (msg) {

2
app/kubernetes/components/kubectl-shell/kubectl-shell.css
View File

@ -60,7 +60,7 @@ ul.sidebar li .shell-item-center a:hover {
bottom: 0; bottom: 0;
left: 0; left: 0;
width: 100vw; width: 100vw;
height: 480px; height: 495px;
z-index: 1000; z-index: 1000;
} }

9
app/portainer/services/terminal-window.js
View File

@ -1,6 +1,6 @@
angular.module('portainer').service('TerminalWindow', function ($window) { angular.module('portainer').service('TerminalWindow', function ($window) {
const terminalHeight = 495;
this.terminalopen = function () { this.terminalopen = function () {
const terminalHeight = 480;
const contentWrapperHeight = $window.innerHeight; const contentWrapperHeight = $window.innerHeight;
const newContentWrapperHeight = contentWrapperHeight - terminalHeight; const newContentWrapperHeight = contentWrapperHeight - terminalHeight;
document.getElementById('content-wrapper').style.height = newContentWrapperHeight + 'px'; document.getElementById('content-wrapper').style.height = newContentWrapperHeight + 'px';
@ -16,4 +16,11 @@ angular.module('portainer').service('TerminalWindow', function ($window) {
document.getElementById('content-wrapper').style.overflowY = wrapperCSS.overflowY; document.getElementById('content-wrapper').style.overflowY = wrapperCSS.overflowY;
document.getElementById('sidebar-wrapper').style.height = wrapperCSS.height; document.getElementById('sidebar-wrapper').style.height = wrapperCSS.height;
}; };
this.terminalresize = function () {
const contentWrapperHeight = $window.innerHeight;
const newContentWrapperHeight = contentWrapperHeight - terminalHeight;
document.getElementById('content-wrapper').style.height = newContentWrapperHeight + 'px';
document.getElementById('content-wrapper').style.overflowY = 'auto';
document.getElementById('sidebar-wrapper').style.height = newContentWrapperHeight + 'px';
};
}); });