Merge branch 'v3'

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2013-08-16 00:49:10 -07:00
commit c3e209f768
3 changed files with 3 additions and 3 deletions

View File

@ -6781,7 +6781,7 @@
break; break;
} else { } else {
if (link = Linkify.regString.exec(result[0])) { if (link = Linkify.regString.exec(result[0])) {
range = Linkify.makeRange(node, node, index + link.index, length); range = Linkify.makeRange(node, node, index, length);
links.push(range); links.push(range);
} }
} }

View File

@ -6792,7 +6792,7 @@
break; break;
} else { } else {
if (link = Linkify.regString.exec(result[0])) { if (link = Linkify.regString.exec(result[0])) {
range = Linkify.makeRange(node, node, index + link.index, length); range = Linkify.makeRange(node, node, index, length);
links.push(range); links.push(range);
} }
} }

View File

@ -77,7 +77,7 @@ Linkify =
else else
if link = Linkify.regString.exec result[0] if link = Linkify.regString.exec result[0]
range = Linkify.makeRange node, node, index + link.index, length range = Linkify.makeRange node, node, index, length
links.push range links.push range
for range in links.reverse() for range in links.reverse()