zuul
/
zuul
Code Issues Proposed changes

Update xterm to >= 3.14.5 

Upstream claims to have fixed the setTheme issue with xterm that led to
us capping it [0]. Separately I've found that latest Firefox 69 beta 6
seems to be broken with log streaming and it appears to be stuck
requesting and animation frame for xterm.js. In an effort to aid
debugging lets update to latest xterm.js as that may fix the problem and
if it doesn't maybe we can escalate to firefox.

[0] https://github.com/xtermjs/xterm.js/pull/2222

Change-Id: I954ee2800e23bbce9c789dc5854a9de6c29f8dcf
This commit is contained in:
Clark Boylan 2019-07-19 13:07:32 -07:00
parent 3d9498f78d
commit 672c4160ee
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/package.json
View File

@ -26,7 +26,7 @@
"redux-thunk": "^2.3.0",
"sockette": "^2.0.0",
"swagger-ui": "^3.20.1",
"xterm": "<3.14.0"
"xterm": "^3.14.5"
},
"devDependencies": {
"eslint": "^5.3.0",

2
web/src/pages/Stream.jsx
View File

@ -68,7 +68,7 @@ class StreamPage extends React.Component {
// correctly so we derive this directly from the window height.
const geometry = this.term.proposeGeometry()
if (geometry) {
const cellHeight = this.term._core.renderer.dimensions.actualCellHeight
const cellHeight = this.term._core._renderCoordinator.dimensions.actualCellHeight
const height = window.innerHeight - this.term.element.offsetTop - 10
const rows = Math.max(Math.floor(height / cellHeight), 10)

8
web/yarn.lock
View File

@ -9837,10 +9837,10 @@ xtend@^4.0.0:
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
xterm@<3.14.0:
version "3.13.2"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.13.2.tgz#987c3a7fe3d23d6c03ce0eaf06c0554c38935570"
integrity sha512-4utKoF16/pzH6+EkFaaay+qPCozf5RP2P0JuH6rvIGHY0CRwgU2LwbQ/24DY+TvaZ5m+kwvIUvPqIBoMZYfgOg==
xterm@^3.14.5:
version "3.14.5"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.14.5.tgz#c9d14e48be6873aa46fb429f22f2165557fd2dea"
integrity sha512-DVmQ8jlEtL+WbBKUZuMxHMBgK/yeIZwkXB81bH+MGaKKnJGYwA+770hzhXPfwEIokK9On9YIFPRleVp/5G7z9g==
y18n@^3.2.1:
version "3.2.1"