From 9413c80376144ec3f73fad50d6d65c82c524574e Mon Sep 17 00:00:00 2001 From: Austin Warren Date: Tue, 16 Jul 2019 17:46:45 -0700 Subject: [PATCH 1/6] Ignore pointer-events for svg icons, this fixes some click event propogation issues --- app/src/global.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/global.scss b/app/src/global.scss index c6377fd9..df6d4e58 100644 --- a/app/src/global.scss +++ b/app/src/global.scss @@ -16,6 +16,10 @@ body { display: none; } +svg { + pointer-events: none; +} + .form-line { display: flex; border-top: 1px solid rgba(0, 0, 0, 0.2); From b0f8dd40367223de659662bd58a0b3594dbd642b Mon Sep 17 00:00:00 2001 From: Austin Warren Date: Tue, 16 Jul 2019 17:47:11 -0700 Subject: [PATCH 2/6] Remove console warning when attempting to resize without xterm being fully initialized --- terminus-terminal/src/frontends/xtermFrontend.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terminus-terminal/src/frontends/xtermFrontend.ts b/terminus-terminal/src/frontends/xtermFrontend.ts index a6cb2909..45e6ff17 100644 --- a/terminus-terminal/src/frontends/xtermFrontend.ts +++ b/terminus-terminal/src/frontends/xtermFrontend.ts @@ -85,7 +85,7 @@ export class XTermFrontend extends Frontend { this.resizeHandler = () => { try { - if (getComputedStyle(this.xtermCore.element).getPropertyValue('height') !== 'auto') { + if (this.xtermCore.element && getComputedStyle(this.xtermCore.element).getPropertyValue('height') !== 'auto') { this.fitAddon.fit() } } catch (e) { From 876aee93df1e89a67225356778d1088d0833e503 Mon Sep 17 00:00:00 2001 From: Austin Warren Date: Tue, 16 Jul 2019 17:59:20 -0700 Subject: [PATCH 3/6] reduce scope of svg pointer event css --- app/src/global.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/global.scss b/app/src/global.scss index df6d4e58..6f316ea7 100644 --- a/app/src/global.scss +++ b/app/src/global.scss @@ -16,8 +16,10 @@ body { display: none; } -svg { - pointer-events: none; +.btn { + & > svg { + pointer-events: none; + } } .form-line { From 77d209e28521b58558168b1c9c0371f15785e24d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2019 04:29:15 +0000 Subject: [PATCH 4/6] Bump xterm from 3.15.0-beta80 to 3.15.0-beta81 in /terminus-terminal Bumps [xterm](https://github.com/xtermjs/xterm.js) from 3.15.0-beta80 to 3.15.0-beta81. - [Release notes](https://github.com/xtermjs/xterm.js/releases) - [Commits](https://github.com/xtermjs/xterm.js/commits) Signed-off-by: dependabot-preview[bot] --- terminus-terminal/package.json | 2 +- terminus-terminal/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/terminus-terminal/package.json b/terminus-terminal/package.json index b92c2ee1..b240eaa7 100644 --- a/terminus-terminal/package.json +++ b/terminus-terminal/package.json @@ -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", diff --git a/terminus-terminal/yarn.lock b/terminus-terminal/yarn.lock index edb46f7d..7d74bd08 100644 --- a/terminus-terminal/yarn.lock +++ b/terminus-terminal/yarn.lock @@ -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" From 60e6e2d3ca61b08722005b5f37957a5af2c09f30 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2019 04:30:24 +0000 Subject: [PATCH 5/6] Bump electron from 5.0.5 to 5.0.7 Bumps [electron](https://github.com/electron/electron) from 5.0.5 to 5.0.7. - [Release notes](https://github.com/electron/electron/releases) - [Commits](https://github.com/electron/electron/compare/v5.0.5...v5.0.7) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ddd90edf..21c02855 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "core-js": "^3.1.4", "cross-env": "5.2.0", "css-loader": "3.0.0", - "electron": "^5.0.5", + "electron": "^5.0.7", "electron-builder": "^21.0.8", "electron-installer-snap": "^4.0.0", "electron-notarize": "^0.1.1", diff --git a/yarn.lock b/yarn.lock index 4a1641f7..47767ea3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1988,10 +1988,10 @@ electron-rebuild@^1.8.5: spawn-rx "^3.0.0" yargs "^13.2.2" -electron@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/electron/-/electron-5.0.5.tgz#2d04499064d3f6c89c4642e47cfe9ea151d794eb" - integrity sha512-GzVQhImBX3rSCFPyJ1u1KbxquoidAHzGeCH2FTs3lzAh1H8m4vd7xh6CNC111mT/I8pxFk5D8s3atJlJQLPAeg== +electron@^5.0.7: + version "5.0.7" + resolved "https://registry.yarnpkg.com/electron/-/electron-5.0.7.tgz#a48fcbd13d30f16f7d7887908b68e52156e90259" + integrity sha512-OMMz8DhatxLuBFbnW7KYcAUjflGYFn0IQEtKR0iZhMAm89FgNOd9SVbxXWAGNxvRR6C0gORXwhTh6BCqqqcR6Q== dependencies: "@types/node" "^10.12.18" electron-download "^4.1.0" From b942a2eb1d1e61018344c8191378e3e76439a70e Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Wed, 17 Jul 2019 08:50:33 +0200 Subject: [PATCH 6/6] don't run docs build in forks --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ab955e1a..a6996e09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,6 +44,7 @@ jobs: if: branch = master script: - set -e + - '[ -z "${encrypted_4e2fb4889ef8_iv}" ] && exit 0' - openssl aes-256-cbc -K $encrypted_4e2fb4889ef8_key -iv $encrypted_4e2fb4889ef8_iv -in .travis.ssh.key.enc -out .travis.ssh.key -d - eval "$(ssh-agent -s)" - chmod 600 .travis.ssh.key