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

Fix http link handler logic

Browse Source
This commit is contained in:
Daniel Imms
2017-03-04 15:02:08 -08:00
parent 1f518b0b45
commit 235ae2fbb9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Linkifier.ts
+3 -3
View File
@@ -157,7 +157,7 @@ export class Linkifier {
const matcher = this._linkMatchers[i]; const matcher = this._linkMatchers[i];
const uri = this._findLinkMatch(text, matcher.regex, matcher.matchIndex); const uri = this._findLinkMatch(text, matcher.regex, matcher.matchIndex);
if (uri) { if (uri) {
const linkElement = this._doLinkifyRow(rowIndex, uri, matcher.handler); const linkElement = this._doLinkifyRow(rowIndex, uri, matcher.handler, matcher.id === HYPERTEXT_LINK_MATCHER_ID);
// Fire validation callback // Fire validation callback
if (linkElement && matcher.validationCallback) { if (linkElement && matcher.validationCallback) {
matcher.validationCallback(uri, isValid => { matcher.validationCallback(uri, isValid => {
@@ -179,14 +179,14 @@ export class Linkifier {
* @param {handler} handler The handler to trigger when the link is triggered. * @param {handler} handler The handler to trigger when the link is triggered.
* @return The link element if it was added, otherwise undefined. * @return The link element if it was added, otherwise undefined.
*/ */
private _doLinkifyRow(rowIndex: number, uri: string, handler?: LinkMatcherHandler): HTMLElement { private _doLinkifyRow(rowIndex: number, uri: string, handler: LinkMatcherHandler, isHttpLinkMatcher: boolean): HTMLElement {
// Iterate over nodes as we want to consider text nodes // Iterate over nodes as we want to consider text nodes
const nodes = this._rows[rowIndex].childNodes; const nodes = this._rows[rowIndex].childNodes;
for (let i = 0; i < nodes.length; i++) { for (let i = 0; i < nodes.length; i++) {
const node = nodes[i]; const node = nodes[i];
const searchIndex = node.textContent.indexOf(uri); const searchIndex = node.textContent.indexOf(uri);
if (searchIndex >= 0) { if (searchIndex >= 0) {
const linkElement = this._createAnchorElement(uri, handler); const linkElement = this._createAnchorElement(uri, handler, isHttpLinkMatcher);
if (node.textContent.length === uri.length) { if (node.textContent.length === uri.length) {
// Matches entire string // Matches entire string