diff --git a/packages/linkify-html/package.json b/packages/linkify-html/package.json
index 1a45f2c..7a4fc40 100644
--- a/packages/linkify-html/package.json
+++ b/packages/linkify-html/package.json
@@ -17,12 +17,7 @@
"url": "git+https://github.com/Hypercontext/linkifyjs.git",
"directory": "packages/linkify-html"
},
- "keywords": [
- "link",
- "autolink",
- "url",
- "email"
- ],
+ "keywords": ["link", "autolink", "url", "email"],
"author": "Hypercontext",
"license": "MIT",
"bugs": {
diff --git a/packages/linkify-html/src/linkify-html.js b/packages/linkify-html/src/linkify-html.js
index db3d385..8f05afb 100644
--- a/packages/linkify-html/src/linkify-html.js
+++ b/packages/linkify-html/src/linkify-html.js
@@ -1,5 +1,5 @@
import { tokenize as htmlTokenize } from '@nfrasser/simple-html-tokenizer';
-import { tokenize, Options} from 'linkifyjs';
+import { tokenize, Options } from 'linkifyjs';
const LinkifyResult = 'LinkifyResult';
const StartTag = 'StartTag';
@@ -32,7 +32,9 @@ export default function linkifyHtml(str, opts = {}) {
// Ignore all the contents of ignored tags
const tagName = token.tagName.toUpperCase();
const isIgnored = tagName === 'A' || options.ignoreTags.indexOf(tagName) >= 0;
- if (!isIgnored) { continue; }
+ if (!isIgnored) {
+ continue;
+ }
let preskipLen = linkifiedTokens.length;
skipTagTokens(tagName, tokens, ++i, linkifiedTokens);
@@ -51,36 +53,42 @@ export default function linkifyHtml(str, opts = {}) {
for (let i = 0; i < linkifiedTokens.length; i++) {
const token = linkifiedTokens[i];
switch (token.type) {
- case LinkifyResult:
- linkified.push(token.rendered);
- break;
- case StartTag: {
- let link = '<' + token.tagName;
- if (token.attributes.length > 0) {
- link += ' ' + attributeArrayToStrings(token.attributes).join(' ');
+ case LinkifyResult:
+ linkified.push(token.rendered);
+ break;
+ case StartTag: {
+ let link = '<' + token.tagName;
+ if (token.attributes.length > 0) {
+ link += ' ' + attributeArrayToStrings(token.attributes).join(' ');
+ }
+ if (token.selfClosing) {
+ link += ' /';
+ }
+ link += '>';
+ linkified.push(link);
+ break;
+ }
+ case EndTag:
+ linkified.push(``);
+ break;
+ case Chars:
+ linkified.push(escapeText(token.chars));
+ break;
+ case Comment:
+ linkified.push(``);
+ break;
+ case Doctype: {
+ let doctype = `';
+ linkified.push(doctype);
+ break;
}
- if (token.selfClosing) { link += ' /'; }
- link += '>';
- linkified.push(link);
- break;
- }
- case EndTag:
- linkified.push(``);
- break;
- case Chars:
- linkified.push(escapeText(token.chars));
- break;
- case Comment:
- linkified.push(``);
- break;
- case Doctype: {
- let doctype = `';
- linkified.push(doctype);
- break;
- }
}
}
@@ -104,14 +112,14 @@ function linkifyChars(str, options) {
type: StartTag,
tagName: 'br',
attributes: [],
- selfClosing: true
+ selfClosing: true,
});
} else if (!token.isLink || !options.check(token)) {
result.push({ type: Chars, chars: token.toString() });
} else {
result.push({
type: LinkifyResult,
- rendered: options.render(token)
+ rendered: options.render(token),
});
}
}
@@ -134,7 +142,6 @@ function linkifyChars(str, options) {
* Will track whether there is a nested tag of the same type
*/
function skipTagTokens(tagName, tokens, i, skippedTokens) {
-
// number of tokens of this type on the [fictional] stack
let stackCount = 1;
@@ -162,10 +169,7 @@ function defaultRender({ tagName, attributes, content }) {
}
function escapeText(text) {
- return text
- .replace(/&/g, '&')
- .replace(//g, '>');
+ return text.replace(//g, '>');
}
function escapeAttr(attr) {
diff --git a/test/spec/linkify-html.test.js b/test/spec/linkify-html.test.js
index d14afd3..6680171 100644
--- a/test/spec/linkify-html.test.js
+++ b/test/spec/linkify-html.test.js
@@ -5,69 +5,77 @@ const svg = [
''
+ '',
].join('');
describe('linkify-html', () => {
-
// For each element in this array
// [0] - Original text
// [1] - Linkified with default options
// [2] - Linkified with new options
const tests = [
+ ['Test with no links', 'Test with no links', 'Test with no links'],
[
- 'Test with no links',
- 'Test with no links',
- 'Test with no links'
- ], [
'The URL is google.com and the email is test@example.com ',
'The URL is google.com and the email is test@example.com ',
- 'The URL is google.com and the email is test@example.com '
- ], [
+ 'The URL is google.com and the email is test@example.com ',
+ ],
+ [
'Super long maps URL https://www.google.ca/maps/@43.472082,-80.5426668,18z?hl=en, a #hash-tag, and an email: test.wut.yo@gmail.co.uk!',
'Super long maps URL https://www.google.ca/maps/@43.472082,-80.5426668,18z?hl=en, a #hash-tag, and an email: test.wut.yo@gmail.co.uk!',
'Super long maps URL https://www.google.ca/maps/@43.472082,-8…, a #hash-tag, and an email: test.wut.yo@gmail.co.uk!',
- ], [
+ ],
+ [
'This link is already in an anchor tag google.com LOL and this one
isnt http://github.com
',
'This link is already in an anchor tag google.com LOL and this one