GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-07-20 02:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/support-multiple-windows-win10

Browse Source
This commit is contained in:
Austin Warren
2019-07-17 17:30:11 -07:00
committed by GitHub
parent 380266a57c 35984ab66e
commit 8ee7022307
7 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
terminus-terminal/package.json
View File

@@ -28,7 +28,7 @@
"runes": "^0.4.2",
"slug": "^1.1.0",
"uuid": "^3.3.2",
"xterm": "3.15.0-beta80",
"xterm": "3.15.0-beta81",
"xterm-addon-fit": "^0.1.0-beta3",
"xterm-addon-ligatures": "^0.1.0-beta-2",
"xterm-addon-search": "^0.2.0-beta1",

1
terminus-terminal/src/frontends/xtermFrontend.ts
View File

@@ -86,7 +86,6 @@ export class XTermFrontend extends Frontend {
this.resizeHandler = () => {
try {
if (this.xtermCore.element && getComputedStyle(this.xtermCore.element).getPropertyValue('height') !== 'auto') {
let t = window.getComputedStyle(this.xtermCore.element.parentElement)
let r = parseInt(t.getPropertyValue("height"))
let n = Math.max(0, parseInt(t.getPropertyValue("width")))

8
terminus-terminal/yarn.lock
View File

@@ -188,10 +188,10 @@ xterm-addon-webgl@^0.2.0-beta1:
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.2.0-beta5.tgz#79d97c21bb09c34c6aca6f4e72afe8085f8a77dc"
integrity sha512-TR6071ZWQ2l0E/P7KedDfsGCW21BWCfemiV/swBF+X/BiRzzsZlJXpZP62jR/XV0/J7r1SMVPSIP5j8TMCoDmw==
xterm@3.15.0-beta80:
version "3.15.0-beta80"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta80.tgz#6a17eea9c9d05667acdede641cfb76a7c0d0a3cd"
integrity sha512-nidVf1uDiOa5BsYR4/uK61qsVeo/gsuvgL6HeVthcLO3WkObGpsXNaZmIFmLmgsyA4RROpjSvKipTFD8mPt+Jg==
xterm@3.15.0-beta81:
version "3.15.0-beta81"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta81.tgz#1a4c01467776753d1cebee8bfafb6c4ee7f9d543"
integrity sha512-tyADfzVm55CAxCIXWJzHWMCRPYcJQp8hO/85KLxRuVjCdeuVgRn/9U9VKypNd9DJkZGsf1rONkQMnG6IDZ1DEQ==
yallist@^2.1.2:
version "2.1.2"