eiac/xterm.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #868 from Tyriar/865_fix_module_build

Browse Source 
Fix module build, add TS declaration files, fix search addon
This commit is contained in:
Daniel Imms
2017-08-08 03:03:50 -07:00
committed by GitHub
parent 17c3ec0d0c f21d5f25ec
commit 91bf3197ae
15 changed files with 59 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Parser.ts
+1 -1
View File
@@ -148,7 +148,7 @@ csiStateHandler['s'] = (handler, params) => handler.saveCursor(params);
csiStateHandler['u'] = (handler, params) => handler.restoreCursor(params);
csiStateHandler[C0.CAN] = (handler, params, prefix, postfix, parser) => parser.setState(ParserState.NORMAL);
enum ParserState {
export enum ParserState {
NORMAL = 0,
ESCAPED = 1,
CSI_PARAM = 2,
src/Terminal.ts
+9
View File
@@ -8,6 +8,15 @@
* has been extended to include xterm CSI codes, among
* other features.
* @license MIT
*
* Terminal Emulation References:
* http://vt100.net/
* http://invisible-island.net/xterm/ctlseqs/ctlseqs.txt
* http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
* http://invisible-island.net/vttest/
* http://www.inwap.com/pdp10/ansicode.txt
* http://linux.die.net/man/4/console_codes
* http://linux.die.net/man/7/urxvt
*/
import { BufferSet } from './BufferSet';
src/addons/attach/attach.js
+6 -6
View File
@@ -9,7 +9,7 @@
/*
* CommonJS environment
*/
module.exports = attach(require('../../xterm'));
module.exports = attach(require('../../Terminal').Terminal);
} else if (typeof define == 'function') {
/*
* Require.js is available
@@ -21,7 +21,7 @@
*/
attach(window.Terminal);
}
})(function (Xterm) {
})(function (Terminal) {
'use strict';
var exports = {};
@@ -29,7 +29,7 @@
/**
* Attaches the given terminal to the given socket.
*
* @param {Xterm} term - The terminal to be attached to the given socket.
* @param {Terminal} term - The terminal to be attached to the given socket.
* @param {WebSocket} socket - The socket to attach the current terminal.
* @param {boolean} bidirectional - Whether the terminal should send data
* to the socket as well.
@@ -82,7 +82,7 @@
/**
* Detaches the given terminal from the given socket
*
* @param {Xterm} term - The terminal to be detached from the given socket.
* @param {Terminal} term - The terminal to be detached from the given socket.
* @param {WebSocket} socket - The socket from which to detach the current
* terminal.
*/
@@ -108,7 +108,7 @@
* should happen instantly or at a maximum
* frequency of 1 rendering per 10ms.
*/
Xterm.prototype.attach = function (socket, bidirectional, buffered) {
Terminal.prototype.attach = function (socket, bidirectional, buffered) {
return exports.attach(this, socket, bidirectional, buffered);
};
@@ -118,7 +118,7 @@
* @param {WebSocket} socket - The socket from which to detach the current
* terminal.
*/
Xterm.prototype.detach = function (socket) {
Terminal.prototype.detach = function (socket) {
return exports.detach(this, socket);
};
src/addons/fit/fit.js
+4 -4
View File
@@ -16,7 +16,7 @@
/*
* CommonJS environment
*/
module.exports = fit(require('../../xterm'));
module.exports = fit(require('../../Terminal').Terminal);
} else if (typeof define == 'function') {
/*
* Require.js is available
@@ -28,7 +28,7 @@
*/
fit(window.Terminal);
}
})(function (Xterm) {
})(function (Terminal) {
var exports = {};
exports.proposeGeometry = function (term) {
@@ -74,11 +74,11 @@
}
};
Xterm.prototype.proposeGeometry = function () {
Terminal.prototype.proposeGeometry = function () {
return exports.proposeGeometry(this);
};
Xterm.prototype.fit = function () {
Terminal.prototype.fit = function () {
return exports.fit(this);
};
src/addons/fullscreen/fullscreen.js
+4 -4
View File
@@ -8,7 +8,7 @@
/*
* CommonJS environment
*/
module.exports = fullscreen(require('../../xterm'));
module.exports = fullscreen(require('../../Terminal').Terminal);
} else if (typeof define == 'function') {
/*
* Require.js is available
@@ -20,12 +20,12 @@
*/
fullscreen(window.Terminal);
}
})(function (Xterm) {
})(function (Terminal) {
var exports = {};
/**
* Toggle the given terminal's fullscreen mode.
* @param {Xterm} term - The terminal to toggle full screen mode
* @param {Terminal} term - The terminal to toggle full screen mode
* @param {boolean} fullscreen - Toggle fullscreen on (true) or off (false)
*/
exports.toggleFullScreen = function (term, fullscreen) {
@@ -42,7 +42,7 @@
term.element.classList[fn]('fullscreen');
};
Xterm.prototype.toggleFullscreen = function (fullscreen) {
Terminal.prototype.toggleFullscreen = function (fullscreen) {
exports.toggleFullScreen(this, fullscreen);
};
src/addons/search/SearchHelper.ts
+2 -3
View File
@@ -15,7 +15,7 @@ interface ISearchResult {
* A class that knows how to search the terminal and how to display the results.
*/
export class SearchHelper {
constructor(private _terminal: any, private _translateBufferLineToString: any) {
constructor(private _terminal: any) {
// TODO: Search for multiple instances on 1 line
// TODO: Don't use the actual selection, instead use a "find selection" so multiple instances can be highlighted
// TODO: Highlight other instances in the viewport
@@ -111,8 +111,7 @@ export class SearchHelper {
* @return The search result if it was found.
*/
private _findInLine(term: string, y: number): ISearchResult {
const bufferLine = this._terminal.buffer.lines.get(y);
const lowerStringLine = this._translateBufferLineToString(bufferLine, true).toLowerCase();
const lowerStringLine = this._terminal.buffer.translateBufferLineToString(y, true).toLowerCase();
const lowerTerm = term.toLowerCase();
const searchIndex = lowerStringLine.indexOf(lowerTerm);
if (searchIndex >= 0) {
src/addons/search/search.ts
+3 -3
View File
@@ -20,7 +20,7 @@ declare var window: any;
/**
* CommonJS environment
*/
module.exports = addon(require('../../xterm'));
module.exports = addon(require('../../Terminal').Terminal);
} else if (typeof define === 'function') {
/**
* Require.js is available
@@ -36,7 +36,7 @@ declare var window: any;
*/
Terminal.prototype.findNext = function(term: string): boolean {
if (!this._searchHelper) {
this.searchHelper = new SearchHelper(this, Terminal.translateBufferLineToString);
this.searchHelper = new SearchHelper(this);
}
return (<SearchHelper>this.searchHelper).findNext(term);
};
@@ -49,7 +49,7 @@ declare var window: any;
*/
Terminal.prototype.findPrevious = function(term: string): boolean {
if (!this._searchHelper) {
this.searchHelper = new SearchHelper(this, Terminal.translateBufferLineToString);
this.searchHelper = new SearchHelper(this);
}
return (<SearchHelper>this.searchHelper).findPrevious(term);
};
src/addons/terminado/terminado.js
+5 -5
View File
@@ -10,7 +10,7 @@
/*
* CommonJS environment
*/
module.exports = attach(require('../../xterm'));
module.exports = attach(require('../../Terminal').Terminal);
} else if (typeof define == 'function') {
/*
* Require.js is available
@@ -22,7 +22,7 @@
*/
attach(window.Terminal);
}
})(function (Xterm) {
})(function (Terminal) {
'use strict';
var exports = {};
@@ -30,7 +30,7 @@
/**
* Attaches the given terminal to the given socket.
*
* @param {Xterm} term - The terminal to be attached to the given socket.
* @param {Terminal} term - The terminal to be attached to the given socket.
* @param {WebSocket} socket - The socket to attach the current terminal.
* @param {boolean} bidirectional - Whether the terminal should send data
* to the socket as well.
@@ -117,7 +117,7 @@
* should happen instantly or at a maximum
* frequency of 1 rendering per 10ms.
*/
Xterm.prototype.terminadoAttach = function (socket, bidirectional, buffered) {
Terminal.prototype.terminadoAttach = function (socket, bidirectional, buffered) {
return exports.terminadoAttach(this, socket, bidirectional, buffered);
};
@@ -127,7 +127,7 @@
* @param {WebSocket} socket - The socket from which to detach the current
* terminal.
*/
Xterm.prototype.terminadoDetach = function (socket) {
Terminal.prototype.terminadoDetach = function (socket) {
return exports.terminadoDetach(this, socket);
};
src/handlers/Clipboard.test.ts
+1 -1
View File
@@ -1,5 +1,5 @@
import { assert } from 'chai';
import * as Terminal from '../xterm';
import * as Terminal from '../Terminal';
import * as Clipboard from './Clipboard';
describe('evaluatePastedTextProcessing', () => {
src/xterm.ts
+2 -11
View File
@@ -1,18 +1,9 @@
/**
* @license MIT
*
* This file is the entry point for browserify.
*/
import { Terminal } from './Terminal';
/**
* Terminal Emulation References:
* http://vt100.net/
* http://invisible-island.net/xterm/ctlseqs/ctlseqs.txt
* http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
* http://invisible-island.net/vttest/
* http://www.inwap.com/pdp10/ansicode.txt
* http://linux.die.net/man/4/console_codes
* http://linux.die.net/man/7/urxvt
*/
module.exports = Terminal;