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

Disable Quote Threading by default

Browse Source
This commit is contained in:
Zixaphir 2013-07-27 03:58:19 -07:00
parent a41b03ec2a
commit abb3b0e5b4
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -1,5 +1,5 @@
/* /*
* appchan x - Version 2.2.0 - 2013-07-26 * appchan x - Version 2.2.0 - 2013-07-27
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE

6
builds/appchan-x.user.js
View File

@ -18,7 +18,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* appchan x - Version 2.2.0 - 2013-07-26 * appchan x - Version 2.2.0 - 2013-07-27
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -220,7 +220,7 @@
'Highlight Own Posts': [false, 'Highlights own posts if Mark Quotes of You is enabled.'], 'Highlight Own Posts': [false, 'Highlights own posts if Mark Quotes of You is enabled.'],
'Mark OP Quotes': [true, 'Add \'(OP)\' to OP quotes.'], 'Mark OP Quotes': [true, 'Add \'(OP)\' to OP quotes.'],
'Mark Cross-thread Quotes': [true, 'Add \'(Cross-thread)\' to cross-threads quotes.'], 'Mark Cross-thread Quotes': [true, 'Add \'(Cross-thread)\' to cross-threads quotes.'],
'Quote Threading': [true, 'Thread conversations'] 'Quote Threading': [false, 'Thread conversations']
} }
}, },
imageExpansion: { imageExpansion: {
@ -8354,7 +8354,7 @@
post: post, post: post,
isReply: isReply isReply: isReply
}); });
URL = threadID === postID ? "/" + g.BOARD + "/res/" + threadID : g.VIEW === 'index' && !QR.cooldown.auto && Conf['Open Post in New Tab'] ? "/" + g.BOARD + "/res/" + threadID + "#p" + postID : void 0; URL = !isReply ? "/" + g.BOARD + "/res/" + threadID : g.VIEW === 'index' && !QR.cooldown.auto && Conf['Open Post in New Tab'] ? "/" + g.BOARD + "/res/" + threadID + "#p" + postID : void 0;
if (URL) { if (URL) {
if (Conf['Open Post in New Tab']) { if (Conf['Open Post in New Tab']) {
$.open(URL); $.open(URL);

6
builds/crx/script.js
View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript // Generated by CoffeeScript
/* /*
* appchan x - Version 2.2.0 - 2013-07-26 * appchan x - Version 2.2.0 - 2013-07-27
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -201,7 +201,7 @@
'Highlight Own Posts': [false, 'Highlights own posts if Mark Quotes of You is enabled.'], 'Highlight Own Posts': [false, 'Highlights own posts if Mark Quotes of You is enabled.'],
'Mark OP Quotes': [true, 'Add \'(OP)\' to OP quotes.'], 'Mark OP Quotes': [true, 'Add \'(OP)\' to OP quotes.'],
'Mark Cross-thread Quotes': [true, 'Add \'(Cross-thread)\' to cross-threads quotes.'], 'Mark Cross-thread Quotes': [true, 'Add \'(Cross-thread)\' to cross-threads quotes.'],
'Quote Threading': [true, 'Thread conversations'] 'Quote Threading': [false, 'Thread conversations']
} }
}, },
imageExpansion: { imageExpansion: {
@ -8331,7 +8331,7 @@
post: post, post: post,
isReply: isReply isReply: isReply
}); });
URL = threadID === postID ? "/" + g.BOARD + "/res/" + threadID : g.VIEW === 'index' && !QR.cooldown.auto && Conf['Open Post in New Tab'] ? "/" + g.BOARD + "/res/" + threadID + "#p" + postID : void 0; URL = !isReply ? "/" + g.BOARD + "/res/" + threadID : g.VIEW === 'index' && !QR.cooldown.auto && Conf['Open Post in New Tab'] ? "/" + g.BOARD + "/res/" + threadID + "#p" + postID : void 0;
if (URL) { if (URL) {
if (Conf['Open Post in New Tab']) { if (Conf['Open Post in New Tab']) {
$.open(URL); $.open(URL);

2
src/General/Config.coffee
View File

@ -358,7 +358,7 @@ Config =
'Add \'(Cross-thread)\' to cross-threads quotes.' 'Add \'(Cross-thread)\' to cross-threads quotes.'
] ]
'Quote Threading': [ 'Quote Threading': [
true false
'Thread conversations' 'Thread conversations'
] ]

3
src/Posting/QuickReply.coffee
View File

@ -1195,10 +1195,11 @@ QR =
QR.cooldown.set {req, post, isReply} QR.cooldown.set {req, post, isReply}
URL = if threadID is postID # new thread URL = unless isReply # new thread
"/#{g.BOARD}/res/#{threadID}" "/#{g.BOARD}/res/#{threadID}"
else if g.VIEW is 'index' and !QR.cooldown.auto and Conf['Open Post in New Tab'] # replying from the index else if g.VIEW is 'index' and !QR.cooldown.auto and Conf['Open Post in New Tab'] # replying from the index
"/#{g.BOARD}/res/#{threadID}#p#{postID}" "/#{g.BOARD}/res/#{threadID}#p#{postID}"
if URL if URL
if Conf['Open Post in New Tab'] if Conf['Open Post in New Tab']
$.open URL $.open URL