Merge branch 'v3'

Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2013-07-25 14:53:26 -07:00
commit 522d5476d8
3 changed files with 6 additions and 6 deletions

View File

@ -6538,13 +6538,13 @@
if (post = g.posts[quoteID]) {
if (!post.isDead) {
a = $.el('a', {
href: "/" + boardID + "/" + post.thread + "/res/#p" + postID,
href: "/" + boardID + "/res/" + post.thread + "#p" + postID,
className: 'quotelink',
textContent: quote
});
} else {
a = $.el('a', {
href: "/" + boardID + "/" + post.thread + "/res/#p" + postID,
href: "/" + boardID + "/res/" + post.thread + "#p" + postID,
className: 'quotelink deadlink',
target: '_blank',
textContent: "" + quote + "\u00A0(Dead)"

View File

@ -6539,13 +6539,13 @@
if (post = g.posts[quoteID]) {
if (!post.isDead) {
a = $.el('a', {
href: "/" + boardID + "/" + post.thread + "/res/#p" + postID,
href: "/" + boardID + "/res/" + post.thread + "#p" + postID,
className: 'quotelink',
textContent: quote
});
} else {
a = $.el('a', {
href: "/" + boardID + "/" + post.thread + "/res/#p" + postID,
href: "/" + boardID + "/res/" + post.thread + "#p" + postID,
className: 'quotelink deadlink',
target: '_blank',
textContent: "" + quote + "\u00A0(Dead)"

View File

@ -40,13 +40,13 @@ Quotify =
# Don't (Dead) when quotifying in an archived post,
# and we know the post still exists.
a = $.el 'a',
href: "/#{boardID}/#{post.thread}/res/#p#{postID}"
href: "/#{boardID}/res/#{post.thread}#p#{postID}"
className: 'quotelink'
textContent: quote
else
# Replace the .deadlink span if we can redirect.
a = $.el 'a',
href: "/#{boardID}/#{post.thread}/res/#p#{postID}"
href: "/#{boardID}/res/#{post.thread}#p#{postID}"
className: 'quotelink deadlink'
target: '_blank'
textContent: "#{quote}\u00A0(Dead)"