waveterm/xterm.js
0
0
Fork 0
mirror of https://github.com/wavetermdev/xterm.js.git synced 2026-08-05 13:43:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix browserify build and search addon (#804)

Browse Source 
Fixes #803
This commit is contained in:
Daniel Imms
2017-07-18 19:58:35 -07:00
committed by GitHub
parent 05d308a37a
commit f8e3fa5a99
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gulpfile.js
+6
View File
@@ -22,6 +22,12 @@ let tsProjectSearchAddon = ts.createProject('./src/addons/search/tsconfig.json')
let srcDir = tsProject.config.compilerOptions.rootDir;
let outDir = tsProject.config.compilerOptions.outDir;
// Under some environments like TravisCI, this comes out at absolute which can
// break the build. This ensures that the outDir is absolute.
if (outDir.indexOf(__dirname) !== 0) {
outDir = `${__dirname}/${outDir}`;
}
/**
* Compile TypeScript sources to JavaScript files and create a source map file for each TypeScript
* file compiled.
src/addons/search/SearchHelper.ts
+6 -6
View File
@@ -35,14 +35,14 @@ export class SearchHelper {
let result: ISearchResult;
let startRow = this._terminal.ydisp;
let startRow = this._terminal.buffer.ydisp;
if (this._terminal.selectionManager.selectionEnd) {
// Start from the selection end if there is a selection
startRow = this._terminal.selectionManager.selectionEnd[1];
}
// Search from ydisp + 1 to end
for (let y = startRow + 1; y < this._terminal.ybase + this._terminal.rows; y++) {
for (let y = startRow + 1; y < this._terminal.buffer.ybase + this._terminal.rows; y++) {
result = this._findInLine(term, y);
if (result) {
break;
@@ -76,7 +76,7 @@ export class SearchHelper {
let result: ISearchResult;
let startRow = this._terminal.ydisp;
let startRow = this._terminal.buffer.ydisp;
if (this._terminal.selectionManager.selectionStart) {
// Start from the selection end if there is a selection
startRow = this._terminal.selectionManager.selectionStart[1];
@@ -92,7 +92,7 @@ export class SearchHelper {
// Search from the top to the current ydisp
if (!result) {
for (let y = this._terminal.ybase + this._terminal.rows - 1; y > startRow; y--) {
for (let y = this._terminal.buffer.ybase + this._terminal.rows - 1; y > startRow; y--) {
result = this._findInLine(term, y);
if (result) {
break;
@@ -111,7 +111,7 @@ export class SearchHelper {
* @return The search result if it was found.
*/
private _findInLine(term: string, y: number): ISearchResult {
const bufferLine = this._terminal.lines.get(y);
const bufferLine = this._terminal.buffer.lines.get(y);
const lowerStringLine = this._translateBufferLineToString(bufferLine, true).toLowerCase();
const lowerTerm = term.toLowerCase();
const searchIndex = lowerStringLine.indexOf(lowerTerm);
@@ -134,7 +134,7 @@ export class SearchHelper {
return false;
}
this._terminal.selectionManager.setSelection(result.col, result.row, result.term.length);
this._terminal.scrollDisp(result.row - this._terminal.ydisp, false);
this._terminal.scrollDisp(result.row - this._terminal.buffer.ydisp, false);
return true;
}
}