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:
Jordan Bates 2013-08-13 15:37:18 -07:00
commit f345151583
4 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4425,7 +4425,7 @@
if (g.VIEW === 'catalog' || !Conf['Linkify']) {
return;
}
this.regString = /(?:[a-z][-\w]+:([a-z\d%\/])|www\d{0,3}[.]|[-a-z\d.]+[.](com|net|org|jp|uk|ru|be|tv|xxx|edu|gov|cd|es|de|se|tk|dk|io|fm|fi)|[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}|[-\w\d.@]+@[a-z\d.-]+\.[a-z\d])/i;
this.regString = /(?:[a-z][-\w]+:([a-z\d%\/])|www\d{0,3}[.]|[-a-z\d.]+[.](com|net|org|co\.jp|uk|ru|be|tv|xxx|edu|gov|cd|es|de|se|tk|dk|io|fm|fi)|[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}|[-\w\d.@]+@[a-z\d.-]+\.[a-z\d])/i;
if (Conf['Comment Expansion']) {
ExpandComment.callbacks.push(this.node);
}
@ -4438,7 +4438,7 @@
});
},
node: function() {
var data, el, end, endNode, i, index, items, lIndex, length, link, links, node, range, result, saved, snapshot, space, test, text, _i, _len, _ref;
var data, el, end, endNode, i, index, items, lIndex, len, length, link, links, node, range, result, saved, snapshot, space, test, text, _i, _len, _ref;
if (this.isClone) {
if (Conf['Embedding']) {
@ -4484,10 +4484,10 @@
}
range = Linkify.makeRange(node, endNode, index, length);
if (link = Linkify.regString.exec(text = range.toString())) {
if (lIndex = link.index) {
range.setStart(node, lIndex + index);
text = text.slice(0, lIndex);
if ((lIndex = link.index) && (len = lIndex + index) < node.data.length) {
range.setStart(node, len);
}
text = text.slice(0, lIndex);
links.push([range, text]);
}
break;
@ -8815,7 +8815,7 @@
IDColor = {
init: function() {
if (!Conf['Color User IDs']) {
if (g.VIEW === 'catalog' || !Conf['Color user IDs']) {
return;
}
return Post.prototype.callbacks.push({
@ -8826,9 +8826,11 @@
node: function() {
var str, uid;
str = this.info.uniqueID;
if (this.isClone || !(str = this.info.uniqueID)) {
return;
}
uid = $('.hand', this.nodes.uniqueID);
if (!(str && uid && uid.nodeName === 'SPAN')) {
if (!(uid && uid.nodeName === 'SPAN')) {
return;
}
return uid.style.cssText = IDColor.css(IDColor.ids[str] || IDColor.compute(str));
@ -8837,7 +8839,7 @@
compute: function(str) {
var hash, rgb;
hash = this.hash(str);
hash = IDColor.hash(str);
rgb = [(hash >> 24) & 0xFF, (hash >> 16) & 0xFF, (hash >> 8) & 0xFF];
rgb[3] = ((rgb[0] * 0.299) + (rgb[1] * 0.587) + (rgb[2] * 0.114)) > 125;
this.ids[str] = rgb;

20
builds/crx/script.js
View File

@ -4431,7 +4431,7 @@
if (g.VIEW === 'catalog' || !Conf['Linkify']) {
return;
}
this.regString = /(?:[a-z][-\w]+:([a-z\d%\/])|www\d{0,3}[.]|[-a-z\d.]+[.](com|net|org|jp|uk|ru|be|tv|xxx|edu|gov|cd|es|de|se|tk|dk|io|fm|fi)|[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}|[-\w\d.@]+@[a-z\d.-]+\.[a-z\d])/i;
this.regString = /(?:[a-z][-\w]+:([a-z\d%\/])|www\d{0,3}[.]|[-a-z\d.]+[.](com|net|org|co\.jp|uk|ru|be|tv|xxx|edu|gov|cd|es|de|se|tk|dk|io|fm|fi)|[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}|[-\w\d.@]+@[a-z\d.-]+\.[a-z\d])/i;
if (Conf['Comment Expansion']) {
ExpandComment.callbacks.push(this.node);
}
@ -4444,7 +4444,7 @@
});
},
node: function() {
var data, el, end, endNode, i, index, items, lIndex, length, link, links, node, range, result, saved, snapshot, space, test, text, _i, _len, _ref;
var data, el, end, endNode, i, index, items, lIndex, len, length, link, links, node, range, result, saved, snapshot, space, test, text, _i, _len, _ref;
if (this.isClone) {
if (Conf['Embedding']) {
@ -4490,10 +4490,10 @@
}
range = Linkify.makeRange(node, endNode, index, length);
if (link = Linkify.regString.exec(text = range.toString())) {
if (lIndex = link.index) {
range.setStart(node, lIndex + index);
text = text.slice(0, lIndex);
if ((lIndex = link.index) && (len = lIndex + index) < node.data.length) {
range.setStart(node, len);
}
text = text.slice(0, lIndex);
links.push([range, text]);
}
break;
@ -8802,7 +8802,7 @@
IDColor = {
init: function() {
if (!Conf['Color User IDs']) {
if (g.VIEW === 'catalog' || !Conf['Color user IDs']) {
return;
}
return Post.prototype.callbacks.push({
@ -8813,9 +8813,11 @@
node: function() {
var str, uid;
str = this.info.uniqueID;
if (this.isClone || !(str = this.info.uniqueID)) {
return;
}
uid = $('.hand', this.nodes.uniqueID);
if (!(str && uid && uid.nodeName === 'SPAN')) {
if (!(uid && uid.nodeName === 'SPAN')) {
return;
}
return uid.style.cssText = IDColor.css(IDColor.ids[str] || IDColor.compute(str));
@ -8824,7 +8826,7 @@
compute: function(str) {
var hash, rgb;
hash = this.hash(str);
hash = IDColor.hash(str);
rgb = [(hash >> 24) & 0xFF, (hash >> 16) & 0xFF, (hash >> 8) & 0xFF];
rgb[3] = ((rgb[0] * 0.299) + (rgb[1] * 0.587) + (rgb[2] * 0.114)) > 125;
this.ids[str] = rgb;

8
src/Linkification/Linkify.coffee
View File

@ -14,7 +14,7 @@ Linkify =
# This should account for virtually all links posted without www or http:
# If it misses any, screw it. No, I will not add canv.as
[-a-z\d.]+[.](
com|net|org|jp|uk|ru|be|tv|xxx|edu|gov|cd|es|de|se|tk|dk|io|fm|fi
com|net|org|co\.jp|uk|ru|be|tv|xxx|edu|gov|cd|es|de|se|tk|dk|io|fm|fi
)
|
# IPv4 Addresses
@ -76,9 +76,9 @@ Linkify =
test.lastIndex = 0 if length is endNode.data.length
range = Linkify.makeRange node, endNode, index, length
if link = Linkify.regString.exec text = range.toString()
if lIndex = link.index
range.setStart node, lIndex + index
text = text[...lIndex]
if (lIndex = link.index) and (len = lIndex + index) < node.data.length
range.setStart node, len
text = text[...lIndex]
links.push [range, text]
break

8
src/Miscellaneous/ColorUserIDs.coffee
View File

@ -1,21 +1,21 @@
IDColor =
init: ->
return unless Conf['Color User IDs']
return if g.VIEW is 'catalog' or !Conf['Color user IDs']
Post::callbacks.push
name: 'Color User IDs'
cb: @node
node: ->
str = @info.uniqueID
return if @isClone or not str = @info.uniqueID
uid = $ '.hand', @nodes.uniqueID
return unless str and uid and uid.nodeName is 'SPAN'
return unless uid and uid.nodeName is 'SPAN'
uid.style.cssText = IDColor.css IDColor.ids[str] or IDColor.compute str
ids: {}
compute: (str) ->
hash = @hash str
hash = IDColor.hash str
rgb = [
(hash >> 24) & 0xFF