Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Strengthen Linkifier

Browse Source 
Now can linkify within code tags, providing the initial 'check'
is successful.
This commit is contained in:
Zixaphir 2013-08-11 23:25:43 -07:00
parent 00093ffd0c
commit 708f56c759
4 changed files with 42 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -1,5 +1,5 @@
/* /*
* 4chan X - Version 1.2.25 - 2013-08-10 * 4chan X - Version 1.2.25 - 2013-08-11
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE

29
builds/4chan-X.user.js
View File

@ -19,7 +19,7 @@
// @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC
// ==/UserScript== // ==/UserScript==
/* /*
* 4chan X - Version 1.2.25 - 2013-08-10 * 4chan X - Version 1.2.25 - 2013-08-11
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
@ -4375,7 +4375,7 @@
if (g.VIEW === 'catalog' || !Conf['Linkify']) { if (g.VIEW === 'catalog' || !Conf['Linkify']) {
return; return;
} }
this.regString = Conf['Allow False Positives'] ? /(\b([a-z]+:\/\/|[a-z]{3,}\.[-a-z0-9]+\.[a-z]|[-a-z0-9]+\.[a-z]|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]|[a-z]{3,}:[a-z0-9?]|[^\s@]+@[a-z0-9.-]+\.[a-z0-9])[^\s'"]+)/gi : /(((magnet|mailto)\:|(www\.)|(news|(ht|f)tp(s?))\:\/\/){1}\S+)/gi; this.regString = Conf['Allow False Positives'] ? /(\b([-a-z]+:\/\/|[a-z]{3,}\.[-a-z0-9]+\.[a-z]|[-a-z0-9]+\.[a-z]|[\d]+\.[\d]+\.[\d]+\.[\d]+\/|[a-z]{3,}:[a-z0-9?]|[^\s@]+@[a-z0-9.-]+\.[a-z0-9])[^\s'"]+)/gi : /(((magnet|mailto)\:|(www\.)|(news|(ht|f)tp(s?))\:\/\/){1}\S+)/gi;
if (Conf['Comment Expansion']) { if (Conf['Comment Expansion']) {
ExpandComment.callbacks.push(this.node); ExpandComment.callbacks.push(this.node);
} }
@ -4403,16 +4403,15 @@
} }
return; return;
} }
snapshot = $.X('.//text()', this.nodes.comment); snapshot = $.X('.//br|.//text()', this.nodes.comment);
i = 0; i = 0;
while (node = snapshot.snapshotItem(i++)) { while (node = snapshot.snapshotItem(i++)) {
if (node.parentElement.nodeName === "A") { if (node.parentElement.nodeName === "A") {
continue; continue;
} }
data = node.data; if (Linkify.regString.test(node.data)) {
if (Linkify.regString.test(data)) {
Linkify.regString.lastIndex = 0; Linkify.regString.lastIndex = 0;
Linkify.gatherLinks(node, this); Linkify.gatherLinks(snapshot, this, node, i);
} }
} }
if (!(Conf['Embedding'] || Conf['Link Title'])) { if (!(Conf['Embedding'] || Conf['Link Title'])) {
@ -4431,7 +4430,7 @@
} }
} }
}, },
gatherLinks: function(node, post) { gatherLinks: function(snapshot, post, node, i) {
var data, index, len, len2, link, links, match, range, _i, _len, _ref; var data, index, len, len2, link, links, match, range, _i, _len, _ref;
data = node.data; data = node.data;
@ -4451,7 +4450,7 @@
} }
Linkify.regString.lastIndex = 0; Linkify.regString.lastIndex = 0;
if (match) { if (match) {
Linkify.seek(match, node, post); links.push(Linkify.seek(snapshot, node, match, i));
} }
_ref = links.reverse(); _ref = links.reverse();
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@ -4459,14 +4458,13 @@
Linkify.makeLink(range, post); Linkify.makeLink(range, post);
} }
}, },
seek: function(match, node, post) { seek: function(snapshot, node, match, i) {
var data, index, link, next, range, result; var data, link, next, range, result;
index = match.index;
link = match[0]; link = match[0];
range = document.createRange(); range = document.createRange();
range.setStart(node, index); range.setStart(node, match.index);
while ((next = node.nextSibling) && next.nodeName !== 'BR') { while ((next = snapshot.snapshotItem(i++)) && next.nodeName !== 'BR') {
node = next; node = next;
data = node.data; data = node.data;
if (result = /[\s'"]/.exec(data)) { if (result = /[\s'"]/.exec(data)) {
@ -4476,7 +4474,7 @@
if (range.collapsed) { if (range.collapsed) {
range.setEndAfter(node); range.setEndAfter(node);
} }
return Linkify.makeLink(range, post); return range;
}, },
makeLink: function(range, post) { makeLink: function(range, post) {
var a, link; var a, link;
@ -4489,7 +4487,8 @@
target: '_blank', target: '_blank',
href: link href: link
}); });
range.surroundContents(a); $.add(a, range.extractContents());
range.insertNode(a);
post.nodes.links.push(a); post.nodes.links.push(a);
}, },
services: function(link) { services: function(link) {

29
builds/crx/script.js
View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript // Generated by CoffeeScript
/* /*
* 4chan X - Version 1.2.25 - 2013-08-10 * 4chan X - Version 1.2.25 - 2013-08-11
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
@ -4380,7 +4380,7 @@
if (g.VIEW === 'catalog' || !Conf['Linkify']) { if (g.VIEW === 'catalog' || !Conf['Linkify']) {
return; return;
} }
this.regString = Conf['Allow False Positives'] ? /(\b([a-z]+:\/\/|[a-z]{3,}\.[-a-z0-9]+\.[a-z]|[-a-z0-9]+\.[a-z]|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]|[a-z]{3,}:[a-z0-9?]|[^\s@]+@[a-z0-9.-]+\.[a-z0-9])[^\s'"]+)/gi : /(((magnet|mailto)\:|(www\.)|(news|(ht|f)tp(s?))\:\/\/){1}\S+)/gi; this.regString = Conf['Allow False Positives'] ? /(\b([-a-z]+:\/\/|[a-z]{3,}\.[-a-z0-9]+\.[a-z]|[-a-z0-9]+\.[a-z]|[\d]+\.[\d]+\.[\d]+\.[\d]+\/|[a-z]{3,}:[a-z0-9?]|[^\s@]+@[a-z0-9.-]+\.[a-z0-9])[^\s'"]+)/gi : /(((magnet|mailto)\:|(www\.)|(news|(ht|f)tp(s?))\:\/\/){1}\S+)/gi;
if (Conf['Comment Expansion']) { if (Conf['Comment Expansion']) {
ExpandComment.callbacks.push(this.node); ExpandComment.callbacks.push(this.node);
} }
@ -4408,16 +4408,15 @@
} }
return; return;
} }
snapshot = $.X('.//text()', this.nodes.comment); snapshot = $.X('.//br|.//text()', this.nodes.comment);
i = 0; i = 0;
while (node = snapshot.snapshotItem(i++)) { while (node = snapshot.snapshotItem(i++)) {
if (node.parentElement.nodeName === "A") { if (node.parentElement.nodeName === "A") {
continue; continue;
} }
data = node.data; if (Linkify.regString.test(node.data)) {
if (Linkify.regString.test(data)) {
Linkify.regString.lastIndex = 0; Linkify.regString.lastIndex = 0;
Linkify.gatherLinks(node, this); Linkify.gatherLinks(snapshot, this, node, i);
} }
} }
if (!(Conf['Embedding'] || Conf['Link Title'])) { if (!(Conf['Embedding'] || Conf['Link Title'])) {
@ -4436,7 +4435,7 @@
} }
} }
}, },
gatherLinks: function(node, post) { gatherLinks: function(snapshot, post, node, i) {
var data, index, len, len2, link, links, match, range, _i, _len, _ref; var data, index, len, len2, link, links, match, range, _i, _len, _ref;
data = node.data; data = node.data;
@ -4456,7 +4455,7 @@
} }
Linkify.regString.lastIndex = 0; Linkify.regString.lastIndex = 0;
if (match) { if (match) {
Linkify.seek(match, node, post); links.push(Linkify.seek(snapshot, node, match, i));
} }
_ref = links.reverse(); _ref = links.reverse();
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@ -4464,14 +4463,13 @@
Linkify.makeLink(range, post); Linkify.makeLink(range, post);
} }
}, },
seek: function(match, node, post) { seek: function(snapshot, node, match, i) {
var data, index, link, next, range, result; var data, link, next, range, result;
index = match.index;
link = match[0]; link = match[0];
range = document.createRange(); range = document.createRange();
range.setStart(node, index); range.setStart(node, match.index);
while ((next = node.nextSibling) && next.nodeName !== 'BR') { while ((next = snapshot.snapshotItem(i++)) && next.nodeName !== 'BR') {
node = next; node = next;
data = node.data; data = node.data;
if (result = /[\s'"]/.exec(data)) { if (result = /[\s'"]/.exec(data)) {
@ -4481,7 +4479,7 @@
if (range.collapsed) { if (range.collapsed) {
range.setEndAfter(node); range.setEndAfter(node);
} }
return Linkify.makeLink(range, post); return range;
}, },
makeLink: function(range, post) { makeLink: function(range, post) {
var a, link; var a, link;
@ -4494,7 +4492,8 @@
target: '_blank', target: '_blank',
href: link href: link
}); });
range.surroundContents(a); $.add(a, range.extractContents());
range.insertNode(a);
post.nodes.links.push(a); post.nodes.links.push(a);
}, },
services: function(link) { services: function(link) {

28
src/Linkification/Linkify.coffee
View File

@ -5,13 +5,13 @@ Linkify =
@regString = if Conf['Allow False Positives'] @regString = if Conf['Allow False Positives']
///( ///(
\b( \b(
[a-z]+:// [-a-z]+://
| |
[a-z]{3,}\.[-a-z0-9]+\.[a-z] [a-z]{3,}\.[-a-z0-9]+\.[a-z]
| |
[-a-z0-9]+\.[a-z] [-a-z0-9]+\.[a-z]
| |
[0-9]+\.[0-9]+\.[0-9]+\.[0-9] [\d]+\.[\d]+\.[\d]+\.[\d]+/
| |
[a-z]{3,}:[a-z0-9?] [a-z]{3,}:[a-z0-9?]
| |
@ -43,17 +43,15 @@ Linkify =
return return
snapshot = $.X './/text()', @nodes.comment snapshot = $.X './/br|.//text()', @nodes.comment
i = 0 i = 0
while node = snapshot.snapshotItem i++ while node = snapshot.snapshotItem i++
continue if node.parentElement.nodeName is "A" continue if node.parentElement.nodeName is "A"
data = node.data if Linkify.regString.test node.data
if Linkify.regString.test data
Linkify.regString.lastIndex = 0 Linkify.regString.lastIndex = 0
Linkify.gatherLinks node, @ Linkify.gatherLinks snapshot, @, node, i
return unless Conf['Embedding'] or Conf['Link Title'] return unless Conf['Embedding'] or Conf['Link Title']
@ -66,7 +64,7 @@ Linkify =
return return
gatherLinks: (node, post) -> gatherLinks: (snapshot, post, node, i) ->
{data} = node {data} = node
len = data.length len = data.length
links = [] links = []
@ -86,20 +84,19 @@ Linkify =
Linkify.regString.lastIndex = 0 Linkify.regString.lastIndex = 0
if match if match
Linkify.seek match, node, post links.push Linkify.seek snapshot, node, match, i
for range in links.reverse() for range in links.reverse()
Linkify.makeLink range, post Linkify.makeLink range, post
return return
seek: (match, node, post) -> seek: (snapshot, node, match, i) ->
{index} = match
link = match[0] link = match[0]
range = document.createRange() range = document.createRange()
range.setStart node, index range.setStart node, match.index
while (next = node.nextSibling) and next.nodeName isnt 'BR' while (next = snapshot.snapshotItem i++) and next.nodeName isnt 'BR'
node = next node = next
data = node.data data = node.data
if result = /[\s'"]/.exec data if result = /[\s'"]/.exec data
@ -108,7 +105,7 @@ Linkify =
if range.collapsed if range.collapsed
range.setEndAfter node range.setEndAfter node
Linkify.makeLink range, post range
makeLink: (range, post) -> makeLink: (range, post) ->
link = range.toString() link = range.toString()
@ -127,7 +124,8 @@ Linkify =
rel: 'nofollow noreferrer' rel: 'nofollow noreferrer'
target: '_blank' target: '_blank'
href: link href: link
range.surroundContents a $.add a, range.extractContents()
range.insertNode a
post.nodes.links.push a post.nodes.links.push a
return return