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

Merge branch 'mayhem' into v3

Browse Source 
Conflicts:
	CHANGELOG.md
	package.json
This commit is contained in:
Zixaphir 2014-05-03 06:09:14 -07:00
commit e8a3f65c5f
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -976,7 +976,7 @@
title: type, title: type,
className: "" + typeLC + "Icon" className: "" + typeLC + "Icon"
}); });
root = type === 'Closed' && this.isSticky ? $('.stickyIcon', this.OP.nodes.info) : g.VIEW === 'index' ? $('.page-num', this.OP.nodes.info) : $('[title="Quote this post"]', this.OP.nodes.info); root = type === 'Closed' && this.isSticky ? $('.stickyIcon', this.OP.nodes.info) : g.VIEW === 'index' ? $('.page-num', this.OP.nodes.info) : $('[title="Reply to this post"]', this.OP.nodes.info);
$.after(root, [$.tn(' '), icon]); $.after(root, [$.tn(' '), icon]);
if (!this.catalogView) { if (!this.catalogView) {
return; return;
@ -3780,7 +3780,7 @@
container = $.el('div', { container = $.el('div', {
id: "pc" + postID, id: "pc" + postID,
className: "postContainer " + (isOP ? 'op' : 'reply') + "Container", className: "postContainer " + (isOP ? 'op' : 'reply') + "Container",
innerHTML: (isOP ? '' : "<div class=sideArrows>&gt;&gt;</div>") + ("<div id=p" + postID + " class='post " + (isOP ? 'op' : 'reply') + (capcode === 'admin_highlight' ? ' highlightPost' : '') + "'>") + (isOP ? fileHTML : '') + "<div class=postInfo>" + ("<input type=checkbox name=" + postID + " value=delete> ") + ("<span class=subject>" + (subject || '') + "</span> ") + ("<span class='nameBlock" + capcodeClass + "'>") + emailStart + ("<span class=name>" + (name || '') + "</span>") + tripcode + capcodeStart + emailEnd + capcodeIcon + userID + flag + ' </span> ' + ("<span class=dateTime data-utc=" + dateUTC + ">" + date + "</span> ") + "<span class='postNum'>" + ("<a href=" + (Build.path(boardID, threadID, postID)) + " title='Highlight this post'>No.</a>") + ("<a href='" + (g.VIEW === 'thread' && g.THREADID === threadID ? "javascript:quote(" + postID + ")" : Build.path(boardID, threadID, postID, 'q')) + "' title='Quote this post'>" + postID + "</a>") + pageIcon + sticky + closed + replyLink + '</span>' + '</div>' + (isOP ? '' : fileHTML) + ("<blockquote class=postMessage>" + (comment || '') + "</blockquote> ") + '</div>' innerHTML: (isOP ? '' : "<div class=sideArrows>&gt;&gt;</div>") + ("<div id=p" + postID + " class='post " + (isOP ? 'op' : 'reply') + (capcode === 'admin_highlight' ? ' highlightPost' : '') + "'>") + (isOP ? fileHTML : '') + "<div class=postInfo>" + ("<input type=checkbox name=" + postID + " value=delete> ") + ("<span class=subject>" + (subject || '') + "</span> ") + ("<span class='nameBlock" + capcodeClass + "'>") + emailStart + ("<span class=name>" + (name || '') + "</span>") + tripcode + capcodeStart + emailEnd + capcodeIcon + userID + flag + ' </span> ' + ("<span class=dateTime data-utc=" + dateUTC + ">" + date + "</span> ") + "<span class='postNum'>" + ("<a href=" + (Build.path(boardID, threadID, postID)) + " title='Link to this post'>No.</a>") + ("<a href='" + (g.VIEW === 'thread' && g.THREADID === threadID ? "javascript:quote(" + postID + ")" : Build.path(boardID, threadID, postID, 'q')) + "' title='Reply to this post'>" + postID + "</a>") + pageIcon + sticky + closed + replyLink + '</span>' + '</div>' + (isOP ? '' : fileHTML) + ("<blockquote class=postMessage>" + (comment || '') + "</blockquote> ") + '</div>'
}); });
_ref = $$('.quotelink', container); _ref = $$('.quotelink', container);
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@ -6051,7 +6051,7 @@
})) { })) {
$.addClass(this.nodes.root, 'your-post'); $.addClass(this.nodes.root, 'your-post');
} }
return $.on($('a[title="Quote this post"]', this.nodes.info), 'click', QR.quote); return $.on($('a[title="Reply to this post"]', this.nodes.info), 'click', QR.quote);
}, },
persist: function() { persist: function() {
if (!QR.postingIsEnabled) { if (!QR.postingIsEnabled) {

6
builds/crx/script.js
View File

@ -1032,7 +1032,7 @@
title: type, title: type,
className: "" + typeLC + "Icon" className: "" + typeLC + "Icon"
}); });
root = type === 'Closed' && this.isSticky ? $('.stickyIcon', this.OP.nodes.info) : g.VIEW === 'index' ? $('.page-num', this.OP.nodes.info) : $('[title="Quote this post"]', this.OP.nodes.info); root = type === 'Closed' && this.isSticky ? $('.stickyIcon', this.OP.nodes.info) : g.VIEW === 'index' ? $('.page-num', this.OP.nodes.info) : $('[title="Reply to this post"]', this.OP.nodes.info);
$.after(root, [$.tn(' '), icon]); $.after(root, [$.tn(' '), icon]);
if (!this.catalogView) { if (!this.catalogView) {
return; return;
@ -3839,7 +3839,7 @@
container = $.el('div', { container = $.el('div', {
id: "pc" + postID, id: "pc" + postID,
className: "postContainer " + (isOP ? 'op' : 'reply') + "Container", className: "postContainer " + (isOP ? 'op' : 'reply') + "Container",
innerHTML: (isOP ? '' : "<div class=sideArrows>&gt;&gt;</div>") + ("<div id=p" + postID + " class='post " + (isOP ? 'op' : 'reply') + (capcode === 'admin_highlight' ? ' highlightPost' : '') + "'>") + (isOP ? fileHTML : '') + "<div class=postInfo>" + ("<input type=checkbox name=" + postID + " value=delete> ") + ("<span class=subject>" + (subject || '') + "</span> ") + ("<span class='nameBlock" + capcodeClass + "'>") + emailStart + ("<span class=name>" + (name || '') + "</span>") + tripcode + capcodeStart + emailEnd + capcodeIcon + userID + flag + ' </span> ' + ("<span class=dateTime data-utc=" + dateUTC + ">" + date + "</span> ") + "<span class='postNum'>" + ("<a href=" + (Build.path(boardID, threadID, postID)) + " title='Highlight this post'>No.</a>") + ("<a href='" + (g.VIEW === 'thread' && g.THREADID === threadID ? "javascript:quote(" + postID + ")" : Build.path(boardID, threadID, postID, 'q')) + "' title='Quote this post'>" + postID + "</a>") + pageIcon + sticky + closed + replyLink + '</span>' + '</div>' + (isOP ? '' : fileHTML) + ("<blockquote class=postMessage>" + (comment || '') + "</blockquote> ") + '</div>' innerHTML: (isOP ? '' : "<div class=sideArrows>&gt;&gt;</div>") + ("<div id=p" + postID + " class='post " + (isOP ? 'op' : 'reply') + (capcode === 'admin_highlight' ? ' highlightPost' : '') + "'>") + (isOP ? fileHTML : '') + "<div class=postInfo>" + ("<input type=checkbox name=" + postID + " value=delete> ") + ("<span class=subject>" + (subject || '') + "</span> ") + ("<span class='nameBlock" + capcodeClass + "'>") + emailStart + ("<span class=name>" + (name || '') + "</span>") + tripcode + capcodeStart + emailEnd + capcodeIcon + userID + flag + ' </span> ' + ("<span class=dateTime data-utc=" + dateUTC + ">" + date + "</span> ") + "<span class='postNum'>" + ("<a href=" + (Build.path(boardID, threadID, postID)) + " title='Link to this post'>No.</a>") + ("<a href='" + (g.VIEW === 'thread' && g.THREADID === threadID ? "javascript:quote(" + postID + ")" : Build.path(boardID, threadID, postID, 'q')) + "' title='Reply to this post'>" + postID + "</a>") + pageIcon + sticky + closed + replyLink + '</span>' + '</div>' + (isOP ? '' : fileHTML) + ("<blockquote class=postMessage>" + (comment || '') + "</blockquote> ") + '</div>'
}); });
_ref = $$('.quotelink', container); _ref = $$('.quotelink', container);
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@ -6104,7 +6104,7 @@
})) { })) {
$.addClass(this.nodes.root, 'your-post'); $.addClass(this.nodes.root, 'your-post');
} }
return $.on($('a[title="Quote this post"]', this.nodes.info), 'click', QR.quote); return $.on($('a[title="Reply to this post"]', this.nodes.info), 'click', QR.quote);
}, },
persist: function() { persist: function() {
if (!QR.postingIsEnabled) { if (!QR.postingIsEnabled) {

3
css/style.css
View File

@ -725,8 +725,7 @@ a.hide-announcement {
/* QR */ /* QR */
:root.hide-original-post-form #postForm, :root.hide-original-post-form #postForm,
:root.hide-original-post-form .postingMode, :root.hide-original-post-form #togglePostFormLink,
:root.hide-original-post-form #togglePostForm,
#qr.autohide:not(.has-focus):not(:hover) > form { #qr.autohide:not(.has-focus):not(:hover) > form {
display: none; display: none;
} }

4
src/General/Build.coffee
View File

@ -214,13 +214,13 @@ Build =
' </span> ' + ' </span> ' +
"<span class=dateTime data-utc=#{dateUTC}>#{date}</span> " + "<span class=dateTime data-utc=#{dateUTC}>#{date}</span> " +
"<span class='postNum'>" + "<span class='postNum'>" +
"<a href=#{Build.path boardID, threadID, postID} title='Highlight this post'>No.</a>" + "<a href=#{Build.path boardID, threadID, postID} title='Link to this post'>No.</a>" +
"<a href='#{ "<a href='#{
if g.VIEW is 'thread' and g.THREADID is threadID if g.VIEW is 'thread' and g.THREADID is threadID
"javascript:quote(#{postID})" "javascript:quote(#{postID})"
else else
Build.path boardID, threadID, postID, 'q' Build.path boardID, threadID, postID, 'q'
}' title='Quote this post'>#{postID}</a>" + }' title='Reply to this post'>#{postID}</a>" +
pageIcon + sticky + closed + replyLink + pageIcon + sticky + closed + replyLink +
'</span>' + '</span>' +
'</div>' + '</div>' +

2
src/General/lib/thread.class
View File

@ -49,7 +49,7 @@ class Thread
else if g.VIEW is 'index' else if g.VIEW is 'index'
$ '.page-num', @OP.nodes.info $ '.page-num', @OP.nodes.info
else else
$ '[title="Quote this post"]', @OP.nodes.info $ '[title="Reply to this post"]', @OP.nodes.info
$.after root, [$.tn(' '), icon] $.after root, [$.tn(' '), icon]
return unless @catalogView return unless @catalogView

2
src/Posting/QR.coffee
View File

@ -82,7 +82,7 @@ QR =
node: -> node: ->
if QR.db.get {boardID: @board.ID, threadID: @thread.ID, postID: @ID} if QR.db.get {boardID: @board.ID, threadID: @thread.ID, postID: @ID}
$.addClass @nodes.root, 'your-post' $.addClass @nodes.root, 'your-post'
$.on $('a[title="Quote this post"]', @nodes.info), 'click', QR.quote $.on $('a[title="Reply to this post"]', @nodes.info), 'click', QR.quote
persist: -> persist: ->
return unless QR.postingIsEnabled return unless QR.postingIsEnabled