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

Merge branch 'v3' of https://github.com/zixaphir/appchan-x

Browse Source
This commit is contained in:
seaweedchan 2013-08-13 23:26:44 -07:00
commit 2f1fc73ee0
3 changed files with 14 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4525,7 +4525,7 @@
return range;
},
makeLink: function(range) {
var a, char, len, text, toggle, trim;
var a, char, text, trim;
text = range.toString();
trim = function() {
@ -4535,35 +4535,13 @@
return text = text.slice(0, -1);
};
if (/[(\[{<]/.test(text.charAt(0))) {
if (/[\)\]}>]/.test(text.charAt(text.length - 1))) {
trim();
}
text.slice(1);
text = text.slice(1);
if (range.startOffset !== range.startContainer.data.length) {
range.setStart(range.startContainer, range.startOffset + 1);
}
}
while (/[\)\]}>,]/.exec(char = text.charAt(text.length - 1))) {
if (char === ',') {
trim();
continue;
}
len = text.length;
while (i < len) {
toggle = false;
switch (text[i++]) {
case '(':
case ')':
case '[':
case ']':
case '{':
case '}':
case '<':
case '>':
toggle = !toggle;
}
}
if (toggle) {
while (/[)\]}>.,]/.test(char = text.charAt(text.length - 1))) {
if (/[.,]/.test(char) || (text.match(/[()\[\]{}<>]/g)).length % 2) {
trim();
continue;
}

30
builds/crx/script.js
View File

@ -4531,7 +4531,7 @@
return range;
},
makeLink: function(range) {
var a, char, len, text, toggle, trim;
var a, char, text, trim;
text = range.toString();
trim = function() {
@ -4541,35 +4541,13 @@
return text = text.slice(0, -1);
};
if (/[(\[{<]/.test(text.charAt(0))) {
if (/[\)\]}>]/.test(text.charAt(text.length - 1))) {
trim();
}
text.slice(1);
text = text.slice(1);
if (range.startOffset !== range.startContainer.data.length) {
range.setStart(range.startContainer, range.startOffset + 1);
}
}
while (/[\)\]}>,]/.exec(char = text.charAt(text.length - 1))) {
if (char === ',') {
trim();
continue;
}
len = text.length;
while (i < len) {
toggle = false;
switch (text[i++]) {
case '(':
case ')':
case '[':
case ']':
case '{':
case '}':
case '<':
case '>':
toggle = !toggle;
}
}
if (toggle) {
while (/[)\]}>.,]/.test(char = text.charAt(text.length - 1))) {
if (/[.,]/.test(char) || (text.match(/[()\[\]{}<>]/g)).length % 2) {
trim();
continue;
}

19
src/Linkification/Linkify.coffee
View File

@ -110,27 +110,20 @@ Linkify =
range.setEnd range.endContainer, range.endOffset - 1 unless range.endOffset < 1
text = text.slice 0, -1
# Clean brackets, hanging commas
# Clean leading brackets
if /[(\[{<]/.test text.charAt 0
trim() if /[\)\]}>]/.test text.charAt text.length - 1
text.slice 1
text = text.slice 1
unless range.startOffset is range.startContainer.data.length
range.setStart range.startContainer, range.startOffset + 1
while /[\)\]}>,]/.exec char = text.charAt text.length - 1
if char is ','
trim()
continue
len = text.length
while i < len
toggle = false
switch text[i++]
when '(', ')', '[', ']', '{', '}', '<', '>' then toggle = !toggle
if toggle
# Clean hanging brackets, commas, periods
while /[)\]}>.,]/.test char = text.charAt text.length - 1
if /[.,]/.test(char) or (text.match /[()\[\]{}<>]/g).length % 2
trim()
continue
break
# This is the only piece of code left based on Anthony Lieuallen's Linkify
text =
if text.contains ':'
text