Merge branch 'master' into 1620_row_render
This commit is contained in:
@@ -61,6 +61,7 @@ irokas <akasidiari@inf.uth.gr>
|
|||||||
Jakob Gillich <jakob@gillich.me>
|
Jakob Gillich <jakob@gillich.me>
|
||||||
Jan Kuri <jkuri88@gmail.com>
|
Jan Kuri <jkuri88@gmail.com>
|
||||||
Jean Bruenn <himself@jeanbruenn.info>
|
Jean Bruenn <himself@jeanbruenn.info>
|
||||||
|
Jeff Principe <princjef@gmail.com>
|
||||||
Jeremy Danyow <jedanyow@microsoft.com>
|
Jeremy Danyow <jedanyow@microsoft.com>
|
||||||
Jianhui Zhao <jianhuizhao329@gmail.com>
|
Jianhui Zhao <jianhuizhao329@gmail.com>
|
||||||
Joao Moreno <jomo@microsoft.com>
|
Joao Moreno <jomo@microsoft.com>
|
||||||
@@ -70,6 +71,7 @@ Jon Austin <jon.i.austin@gmail.com>
|
|||||||
Jon Kohler <jon@nutanix.com>
|
Jon Kohler <jon@nutanix.com>
|
||||||
Jon Masters <jon.masters@sky.com>
|
Jon Masters <jon.masters@sky.com>
|
||||||
Jörg Breitbart <jerch@rockborn.de>
|
Jörg Breitbart <jerch@rockborn.de>
|
||||||
|
Jose Anton <roke22@gmail.com>
|
||||||
jpoth <poth.john@gmail.com>
|
jpoth <poth.john@gmail.com>
|
||||||
Justin Luk <jluk@users.noreply.github.com>
|
Justin Luk <jluk@users.noreply.github.com>
|
||||||
Justin Mecham <justin@mecham.me>
|
Justin Mecham <justin@mecham.me>
|
||||||
@@ -103,6 +105,7 @@ Peng Xiao <pengxiao@outlook.com>
|
|||||||
Peter Baumgarten <me@peterbaumgarten.com>
|
Peter Baumgarten <me@peterbaumgarten.com>
|
||||||
Philip Olson <philip.olson@protonmail.ch>
|
Philip Olson <philip.olson@protonmail.ch>
|
||||||
PowerHat <31401273+7PH@users.noreply.github.com>
|
PowerHat <31401273+7PH@users.noreply.github.com>
|
||||||
|
PowerHat <b.raymond@protonmail.com>
|
||||||
pro-src <34285059+pro-src@users.noreply.github.com>
|
pro-src <34285059+pro-src@users.noreply.github.com>
|
||||||
pro-src <rodneyd.teal@gmail.com>
|
pro-src <rodneyd.teal@gmail.com>
|
||||||
Rick Baker <rick@ricktbaker.com>
|
Rick Baker <rick@ricktbaker.com>
|
||||||
@@ -111,6 +114,7 @@ Saad Malik <simfox3@gmail.com>
|
|||||||
Samuel Williams <samuel.williams@oriontransfer.co.nz>
|
Samuel Williams <samuel.williams@oriontransfer.co.nz>
|
||||||
Saswat Das <saswatds@users.noreply.github.com>
|
Saswat Das <saswatds@users.noreply.github.com>
|
||||||
Saul Costa <saul@codevolve.com>
|
Saul Costa <saul@codevolve.com>
|
||||||
|
Segev Finer <segev208@gmail.com>
|
||||||
Shuanglei Tao <tsl0922@gmail.com>
|
Shuanglei Tao <tsl0922@gmail.com>
|
||||||
sitzmar <sitzmar@gmail.com>
|
sitzmar <sitzmar@gmail.com>
|
||||||
Steven Silvester <steven.silvester@ieee.org>
|
Steven Silvester <steven.silvester@ieee.org>
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
],
|
],
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"module": "commonjs",
|
"module": "commonjs",
|
||||||
"target": "es5"
|
"target": "es5",
|
||||||
|
"noEmit": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "xterm",
|
"name": "xterm",
|
||||||
"description": "Full xterm terminal, in your browser",
|
"description": "Full xterm terminal, in your browser",
|
||||||
"version": "3.5.0",
|
"version": "3.6.0",
|
||||||
"main": "lib/public/Terminal.js",
|
"main": "lib/public/Terminal.js",
|
||||||
"types": "typings/xterm.d.ts",
|
"types": "typings/xterm.d.ts",
|
||||||
"repository": "https://github.com/xtermjs/xterm.js",
|
"repository": "https://github.com/xtermjs/xterm.js",
|
||||||
|
|||||||
@@ -1631,6 +1631,9 @@ export class InputHandler extends Disposable implements IInputHandler {
|
|||||||
// not bold nor faint
|
// not bold nor faint
|
||||||
flags &= ~FLAGS.BOLD;
|
flags &= ~FLAGS.BOLD;
|
||||||
flags &= ~FLAGS.DIM;
|
flags &= ~FLAGS.DIM;
|
||||||
|
} else if (p === 23) {
|
||||||
|
// not italic
|
||||||
|
flags &= ~FLAGS.ITALIC;
|
||||||
} else if (p === 24) {
|
} else if (p === 24) {
|
||||||
// not underlined
|
// not underlined
|
||||||
flags &= ~FLAGS.UNDERLINE;
|
flags &= ~FLAGS.UNDERLINE;
|
||||||
|
|||||||
@@ -163,7 +163,5 @@ describe('typings', () => {
|
|||||||
const fixtureDir = path.join(__dirname, '..', 'fixtures', 'typings-test');
|
const fixtureDir = path.join(__dirname, '..', 'fixtures', 'typings-test');
|
||||||
const result = cp.spawnSync(tsc, { cwd: fixtureDir });
|
const result = cp.spawnSync(tsc, { cwd: fixtureDir });
|
||||||
assert.equal(result.status, 0, `build did not succeed:\nstdout: ${result.stdout.toString()}\nstderr: ${result.stderr.toString()}\n`);
|
assert.equal(result.status, 0, `build did not succeed:\nstdout: ${result.stdout.toString()}\nstderr: ${result.stderr.toString()}\n`);
|
||||||
// Clean up
|
|
||||||
fs.unlinkSync(path.join(fixtureDir, 'typings-test.js'));
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user