Compare commits

...
10 Commits
Author SHA1 Message Date
Paris Kasidiaris 2b92996d7c Bump version to 2.8.1
Signed-off-by: Paris Kasidiaris <paris@sourcelair.com>
2017-07-08 14:02:43 +00:00
Paris Kasidiaris b8944beea9 Merge pull request #768 from Tyriar/767_initial_viewport_wrap
Properly mark initial viewport lines as wrapped
2017-07-08 16:49:46 +03:00
Paris Kasidiaris 67435edad7 Merge branch 'master' into 767_initial_viewport_wrap 2017-07-08 16:45:47 +03:00
Paris Kasidiaris fc9a0f15db Merge pull request #769 from sourcelair/fix-tests
Update jsdom to 11.1
2017-07-08 16:44:57 +03:00
Paris Kasidiaris 8a57489966 Add missing semicolon 2017-07-08 16:40:18 +03:00
Paris Kasidiaris 3a8c1b3fcd Update copyright note 2017-07-08 16:36:19 +03:00
Paris Kasidiaris 0c2f079670 Update gulpfile.js
The `outDir` compiler option of TypeScript seems to be an absolute URL now.
2017-07-08 16:35:53 +03:00
Paris Kasidiaris d266d995ab Fix typo 2017-07-08 11:13:06 +03:00
Paris Kasidiaris 0ea2e9cfd6 Update jsdom to 1.11
Also, add package-lock.json
2017-07-08 10:59:38 +03:00
Daniel Imms 9b8cb03c55 Properly mark initial viewport lines as wrapped
Fixes #767
2017-07-07 11:18:18 -07:00
11 changed files with 11929 additions and 33 deletions
+1 -1
View File
@@ -135,6 +135,6 @@ To contribute either code, documentation or issues to xterm.js please read the [
If you contribute code to this project, you are implicitly allowing your code to be distributed under the MIT license. You are also implicitly verifying that all code is your original work.
Copyright (c) 2014-2016, SourceLair, Private Company ([www.sourcelair.com](https://www.sourcelair.com/home)) (MIT License)
Copyright (c) 2014-2017, SourceLair, Private Company ([www.sourcelair.com](https://www.sourcelair.com/home)) (MIT License)
Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "xterm.js",
"version": "2.8.0",
"version": "2.8.1",
"ignore": ["demo", "test", ".gitignore"],
"main": [
"dist/xterm.js",
+3
View File
@@ -430,6 +430,9 @@ var InputHandler = (function () {
this._terminal.y--;
this._terminal.scroll(true);
}
else {
this._terminal.lines.get(this._terminal.y).isWrapped = true;
}
}
else {
if (ch_width === 2)
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -50,7 +50,7 @@ gulp.task('browserify', ['tsc'], function() {
let browserifyOptions = {
basedir: buildDir,
debug: true,
entries: [`../${outDir}/xterm.js`],
entries: [`${outDir}/xterm.js`],
standalone: 'Terminal',
cache: {},
packageCache: {}
+11892
View File
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -1,7 +1,7 @@
{
"name": "xterm",
"description": "Full xterm terminal, in your browser",
"version": "2.8.0",
"version": "2.8.1",
"ignore": [
"demo",
"test",
@@ -36,7 +36,7 @@
],
"devDependencies": {
"@types/chai": "^3.4.34",
"@types/jsdom": "^2.0.30",
"@types/jsdom": "^11.0.1",
"@types/mocha": "^2.2.33",
"@types/node": "^6.0.41",
"browserify": "^13.1.0",
@@ -54,7 +54,7 @@
"gulp-sourcemaps": "1.9.1",
"gulp-typescript": "^3.1.3",
"jsdoc": "3.4.3",
"jsdom": "^9.11.0",
"jsdom": "^11.1.0",
"merge-stream": "^1.0.1",
"node-pty": "^0.4.1",
"nodemon": "1.10.2",
+5
View File
@@ -56,8 +56,13 @@ export class InputHandler implements IInputHandler {
this._terminal.x = 0;
this._terminal.y++;
if (this._terminal.y > this._terminal.scrollBottom) {
// Insert a new line, scroll and mark as a wrapped line
this._terminal.y--;
this._terminal.scroll(true);
} else {
// The line already exists (eg. the initial viewport), mark it as a
// wrapped line
this._terminal.lines.get(this._terminal.y).isWrapped = true;
}
} else {
if (ch_width === 2) // FIXME: check for xterm behavior
+6 -7
View File
@@ -17,6 +17,7 @@ class TestLinkifier extends Linkifier {
}
describe('Linkifier', () => {
let dom: jsdom.JSDOM;
let window: Window;
let document: Document;
@@ -24,13 +25,11 @@ describe('Linkifier', () => {
let rows: HTMLElement[];
let linkifier: TestLinkifier;
beforeEach(done => {
jsdom.env('', (err, w) => {
window = w;
document = window.document;
linkifier = new TestLinkifier();
done();
});
beforeEach(() => {
dom = new jsdom.JSDOM('');
window = dom.window;
document = window.document;
linkifier = new TestLinkifier();
});
function addRow(html: string) {
+8 -9
View File
@@ -31,6 +31,7 @@ class TestSelectionManager extends SelectionManager {
}
describe('SelectionManager', () => {
let dom: jsdom.JSDOM;
let window: Window;
let document: Document;
@@ -39,15 +40,13 @@ describe('SelectionManager', () => {
let rowContainer: HTMLElement;
let selectionManager: TestSelectionManager;
beforeEach(done => {
jsdom.env('', (err, w) => {
window = w;
document = window.document;
buffer = new CircularList<any>(100);
terminal = <any>{ cols: 80, rows: 2 };
selectionManager = new TestSelectionManager(terminal, buffer, rowContainer, null);
done();
});
beforeEach(() => {
dom = new jsdom.JSDOM('');
window = dom.window;
document = window.document;
buffer = new CircularList<any>(100);
terminal = <any>{ cols: 80, rows: 2 };
selectionManager = new TestSelectionManager(terminal, buffer, rowContainer, null);
});
function stringToRow(text: string): [number, string, number][] {
+8 -10
View File
@@ -7,21 +7,19 @@ import { ICharMeasure, ITerminal } from '../Interfaces';
import { CharMeasure } from './CharMeasure';
describe('CharMeasure', () => {
let dom: jsdom.JSDOM;
let window: Window;
let document: Document;
let container: HTMLElement;
let charMeasure: ICharMeasure;
beforeEach(done => {
jsdom.env('', (err, w) => {
window = w;
document = window.document;
container = document.createElement('div');
document.body.appendChild(container);
charMeasure = new CharMeasure(document, container);
done();
});
beforeEach(() => {
dom = new jsdom.JSDOM('');
window = dom.window;
document = window.document;
container = document.createElement('div');
document.body.appendChild(container);
charMeasure = new CharMeasure(document, container);
});
describe('measure', () => {