Merge branch 'canary'

This commit is contained in:
Labhansh Agrawal 2021-07-19 13:57:34 +05:30
commit 001210420a
2 changed files with 5 additions and 2 deletions

View file

@ -14,7 +14,10 @@ jobs:
strategy: strategy:
matrix: matrix:
node-version: [14.x] node-version: [14.x]
os: [macos-11.0, ubuntu-latest, windows-latest] os:
- macos-11.0
- ubuntu-18.04
- windows-latest
fail-fast: false fail-fast: false
steps: steps:
- name: Checkout - name: Checkout

View file

@ -176,7 +176,7 @@ export default class Term extends React.PureComponent<TermProps> {
if (useWebGL) { if (useWebGL) {
this.term.loadAddon(new WebglAddon()); this.term.loadAddon(new WebglAddon());
} }
if (props.disableLigatures !== true) { if (props.disableLigatures !== true && !useWebGL) {
this.term.loadAddon(new LigaturesAddon()); this.term.loadAddon(new LigaturesAddon());
} }
this.term.loadAddon(new Unicode11Addon()); this.term.loadAddon(new Unicode11Addon());