Merge branch 'v3'
Conflicts: builds/crx/script.js
This commit is contained in:
commit
1fbcbe0507
@ -18,7 +18,7 @@
|
||||
// @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC
|
||||
// ==/UserScript==
|
||||
/*
|
||||
* 4chan X - Version 1.2.25 - 2013-08-04
|
||||
* 4chan X - Version 1.2.25 - 2013-08-05
|
||||
*
|
||||
* Licensed under the MIT license.
|
||||
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
|
||||
@ -4368,6 +4368,7 @@
|
||||
range.setEnd(node, len2);
|
||||
links.push(range);
|
||||
}
|
||||
Linkify.regString.lastIndex = 0;
|
||||
if (match) {
|
||||
Linkify.seek(match, node, post);
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
// ==/UserScript==
|
||||
|
||||
/*
|
||||
* appchan x - Version 2.2.2 - 2013-08-04
|
||||
* appchan x - Version 2.2.2 - 2013-08-05
|
||||
*
|
||||
* Licensed under the MIT license.
|
||||
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE
|
||||
@ -6660,6 +6660,7 @@
|
||||
range.setEnd(node, len2);
|
||||
links.push(range);
|
||||
}
|
||||
Linkify.regString.lastIndex = 0;
|
||||
if (match) {
|
||||
Linkify.seek(match, node, post);
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
// Generated by CoffeeScript
|
||||
/*
|
||||
* appchan x - Version 2.2.2 - 2013-08-04
|
||||
* appchan x - Version 2.2.2 - 2013-08-05
|
||||
*
|
||||
* Licensed under the MIT license.
|
||||
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE
|
||||
@ -6667,6 +6667,7 @@
|
||||
range.setEnd(node, len2);
|
||||
links.push(range);
|
||||
}
|
||||
Linkify.regString.lastIndex = 0;
|
||||
if (match) {
|
||||
Linkify.seek(match, node, post);
|
||||
}
|
||||
|
||||
@ -76,6 +76,8 @@ Linkify =
|
||||
range.setEnd node, len2
|
||||
links.push range
|
||||
|
||||
Linkify.regString.lastIndex = 0
|
||||
|
||||
if match
|
||||
Linkify.seek match, node, post
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user