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

Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3

Browse Source 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	package.json
	src/Posting/QuickReply.coffee
This commit is contained in:
Zixaphir 2013-07-24 21:49:24 -07:00
commit 44a2b378ca
13 changed files with 192 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
CHANGELOG.md
View File

@ -4,6 +4,40 @@
- Fix flag filtering on /sp/ and /int/. - Fix flag filtering on /sp/ and /int/.
- Minor fixes. - Minor fixes.
### v1.2.24
*2013-07-24*
**seaweedchan**:
- Update archives (warosu is back up, and with it, the option to use it).
### v1.2.23
*2013-07-23*
**matt4682**:
- Small fix for new error message.
### v1.2.22
*2013-07-23*
**seaweedchan**:
- Update archives.
### v1.2.21
*2013-07-22*
**seaweedchan**:
- Fix /f/ posting.
- Change the "Connection error" message, and point to my own FAQ instead of Mayhem's.
### v1.2.20
*2013-07-22*
**MayhemYDG**:
- Fixed captcha caching not syncing across open threads.
**seaweedchan**:
- Changed some defaults around
### v1.2.19 ### v1.2.19
*2013-07-14* *2013-07-14*

6
Gruntfile.coffee
View File

@ -172,19 +172,19 @@ module.exports = (grunt) ->
] ]
grunt.registerTask 'patch', [ grunt.registerTask 'patch', [
'bump' 'bump-only'
'reloadPkg' 'reloadPkg'
'updcl:3' 'updcl:3'
] ]
grunt.registerTask 'minor', [ grunt.registerTask 'minor', [
'bump:minor' 'bump-only:minor'
'reloadPkg' 'reloadPkg'
'updcl:2' 'updcl:2'
] ]
grunt.registerTask 'major', [ grunt.registerTask 'major', [
'bump:major' 'bump-only:major'
'reloadPkg' 'reloadPkg'
'updcl:1' 'updcl:1'
] ]

2
LICENSE
View File

@ -1,5 +1,5 @@
/* /*
* 4chan X - Version 1.2.19 - 2013-07-21 * 4chan X - Version 1.2.24 - 2013-07-24
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE

447
builds/4chan-X.js
View File

File diff suppressed because one or more lines are too long

2
builds/4chan-X.meta.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.2.19 // @version 1.2.24
// @namespace 4chan-X // @namespace 4chan-X
// @description Cross-browser userscript for maximum lurking on 4chan. // @description Cross-browser userscript for maximum lurking on 4chan.
// @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE // @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE

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

@ -1,7 +1,7 @@
// Generated by CoffeeScript // Generated by CoffeeScript
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.2.19 // @version 1.2.24
// @namespace 4chan-X // @namespace 4chan-X
// @description Cross-browser userscript for maximum lurking on 4chan. // @description Cross-browser userscript for maximum lurking on 4chan.
// @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE // @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
@ -19,7 +19,7 @@
// @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC
// ==/UserScript== // ==/UserScript==
/* /*
* 4chan X - Version 1.2.19 - 2013-07-21 * 4chan X - Version 1.2.24 - 2013-07-24
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
@ -126,7 +126,7 @@
'404 Redirect': [true, 'Redirect dead threads and images.'], '404 Redirect': [true, 'Redirect dead threads and images.'],
'Keybinds': [true, 'Bind actions to keyboard shortcuts.'], 'Keybinds': [true, 'Bind actions to keyboard shortcuts.'],
'Time Formatting': [true, 'Localize and format timestamps.'], 'Time Formatting': [true, 'Localize and format timestamps.'],
'Relative Post Dates': [false, 'Display dates like "3 minutes ago". Tooltip shows the timestamp.'], 'Relative Post Dates': [true, 'Display dates like "3 minutes ago". Tooltip shows the timestamp.'],
'File Info Formatting': [true, 'Reformat the file information.'], 'File Info Formatting': [true, 'Reformat the file information.'],
'Comment Expansion': [true, 'Add buttons to expand long comments.'], 'Comment Expansion': [true, 'Add buttons to expand long comments.'],
'Thread Expansion': [true, 'Add buttons to expand threads.'], 'Thread Expansion': [true, 'Add buttons to expand threads.'],
@ -150,14 +150,14 @@
'Anonymize': [false, 'Make everyone Anonymous.'], 'Anonymize': [false, 'Make everyone Anonymous.'],
'Filter': [true, 'Self-moderation placebo.'], 'Filter': [true, 'Self-moderation placebo.'],
'Recursive Hiding': [true, 'Hide replies of hidden posts, recursively.'], 'Recursive Hiding': [true, 'Hide replies of hidden posts, recursively.'],
'Thread Hiding Buttons': [true, 'Add buttons to hide entire threads.'], 'Thread Hiding Buttons': [false, 'Add buttons to hide entire threads.'],
'Reply Hiding Buttons': [true, 'Add buttons to hide single replies.'], 'Reply Hiding Buttons': [false, 'Add buttons to hide single replies.'],
'Filtered Backlinks': [true, 'When enabled, shows backlinks to filtered posts with a line-through decoration. Otherwise, hides the backlinks.'], 'Filtered Backlinks': [true, 'When enabled, shows backlinks to filtered posts with a line-through decoration. Otherwise, hides the backlinks.'],
'Stubs': [true, 'Show stubs of hidden threads / replies.'] 'Stubs': [true, 'Show stubs of hidden threads / replies.']
}, },
'Images': { 'Images': {
'Image Expansion': [true, 'Expand images.'], 'Image Expansion': [true, 'Expand images.'],
'Image Hover': [false, 'Show full image on mouseover.'], 'Image Hover': [true, 'Show full image on mouseover.'],
'Sauce': [true, 'Add sauce links to images.'], 'Sauce': [true, 'Add sauce links to images.'],
'Reveal Spoilers': [false, 'Reveal spoiler thumbnails.'], 'Reveal Spoilers': [false, 'Reveal spoiler thumbnails.'],
'Replace GIF': [false, 'Replace thumbnail of gifs with its actual image.'], 'Replace GIF': [false, 'Replace thumbnail of gifs with its actual image.'],
@ -186,14 +186,14 @@
'Page Count in Stats': [false, 'Display the page count in the thread stats as well.'], 'Page Count in Stats': [false, 'Display the page count in the thread stats as well.'],
'Updater and Stats in Header': [true, 'Places the thread updater and thread stats in the header instead of floating them.'], 'Updater and Stats in Header': [true, 'Places the thread updater and thread stats in the header instead of floating them.'],
'Thread Watcher': [true, 'Bookmark threads.'], 'Thread Watcher': [true, 'Bookmark threads.'],
'Toggleable Thread Watcher': [false, 'Adds a shortcut for the thread watcher, hides the watcher by default, and makes it scroll with the page.'], 'Toggleable Thread Watcher': [true, 'Adds a shortcut for the thread watcher, hides the watcher by default, and makes it scroll with the page.'],
'Auto Watch': [true, 'Automatically watch threads you start.'], 'Auto Watch': [true, 'Automatically watch threads you start.'],
'Auto Watch Reply': [false, 'Automatically watch threads you reply to.'] 'Auto Watch Reply': [false, 'Automatically watch threads you reply to.']
}, },
'Posting': { 'Posting': {
'Quick Reply': [true, 'All-in-one form to reply, create threads, automate dumping and more.'], 'Quick Reply': [true, 'All-in-one form to reply, create threads, automate dumping and more.'],
'Persistent QR': [false, 'The Quick reply won\'t disappear after posting.'], 'Persistent QR': [true, 'The Quick reply won\'t disappear after posting.'],
'Auto Hide QR': [false, 'Automatically hide the quick reply when posting.'], 'Auto Hide QR': [true, 'Automatically hide the quick reply when posting.'],
'Open Post in New Tab': [true, 'Open new threads or replies to a thread from the index in a new tab.'], 'Open Post in New Tab': [true, 'Open new threads or replies to a thread from the index in a new tab.'],
'Remember Subject': [false, 'Remember the subject field, instead of resetting after posting.'], 'Remember Subject': [false, 'Remember the subject field, instead of resetting after posting.'],
'Remember QR Size': [false, 'Remember the size of the Quick reply.'], 'Remember QR Size': [false, 'Remember the size of the Quick reply.'],
@ -219,14 +219,14 @@
'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': [false, 'Thread conversations'] 'Quote Threading': [true, 'Thread conversations']
} }
}, },
imageExpansion: { imageExpansion: {
'Fit width': [true, ''], 'Fit width': [false, ''],
'Fit height': [false, ''], 'Fit height': [false, ''],
'Expand spoilers': [true, 'Expand all images along with spoilers.'], 'Expand spoilers': [true, 'Expand all images along with spoilers.'],
'Expand from here': [true, 'Expand all images only from current position to thread end.'], 'Expand from here': [false, 'Expand all images only from current position to thread end.'],
'Advance on contract': [false, 'Advance to next post when contracting an expanded image.'] 'Advance on contract': [false, 'Advance to next post when contracting an expanded image.']
}, },
filter: { filter: {
@ -256,7 +256,7 @@
'Bottom Board List': true, 'Bottom Board List': true,
'Custom Board Navigation': true 'Custom Board Navigation': true
}, },
boardnav: "[ toggle-all ]\n[current-title]\n[external-text:\"FAQ\",\"https://github.com/seaweedchan/4chan-x/wiki/Frequently-Asked-Questions\"]", boardnav: "[ toggle-all ]\na-replace\nc-replace\ng-replace\nk-replace\nv-replace\nvg-replace\nvr-replace\nck-replace\nco-replace\nfit-replace\njp-replace\nmu-replace\nsp-replace\ntv-replace\nvp-replace\nq-replace\n[external-text:\"FAQ\",\"https://github.com/seaweedchan/4chan-x/wiki/Frequently-Asked-Questions\"]",
QR: { QR: {
'QR.personas': "#email:\"sage\";boards:jp;always" 'QR.personas': "#email:\"sage\";boards:jp;always"
}, },
@ -320,7 +320,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.2.19', VERSION: '1.2.24',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {}, boards: {},
threads: {}, threads: {},
@ -4672,7 +4672,7 @@
} }
$.ready(this.initReady); $.ready(this.initReady);
if (Conf['Persistent QR']) { if (Conf['Persistent QR']) {
if (g.BOARD.ID !== 'f') { if (!(g.BOARD.ID === 'f' && g.VIEW === 'index')) {
$.on(d, '4chanXInitFinished', this.persist); $.on(d, '4chanXInitFinished', this.persist);
} else { } else {
$.ready(this.persist); $.ready(this.persist);
@ -5948,7 +5948,7 @@
QR.cooldown.auto = false; QR.cooldown.auto = false;
QR.status(); QR.status();
return QR.error($.el('span', { return QR.error($.el('span', {
innerHTML: "Connection error. You may have been <a href=//www.4chan.org/banned target=_blank>banned</a>.\n[<a href=\"https://github.com/MayhemYDG/4chan-x/wiki/FAQ#what-does-connection-error-you-may-have-been-banned-mean\" target=_blank>FAQ</a>]" innerHTML: "4chan X encountered an error while posting. Please try again. \n[<a href=\"https://github.com/seaweedchan/4chan-x/wiki/Frequently-Asked-Questions#what-does-4chan-x-encountered-an-error-while-posting-please-try-again-mean\" target=_blank>?</a>]"
})); }));
} }
}; };
@ -8002,7 +8002,7 @@
'http': false, 'http': false,
'https': true, 'https': true,
'software': 'foolfuuka', 'software': 'foolfuuka',
'boards': ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'vg', 'vp', 'vr', 'wsg'], 'boards': ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'vp', 'vr', 'wsg'],
'files': ['a', 'gd', 'jp', 'm', 'q', 'tg', 'vg', 'vp', 'vr', 'wsg'] 'files': ['a', 'gd', 'jp', 'm', 'q', 'tg', 'vg', 'vp', 'vr', 'wsg']
}, },
'NSFW Foolz': { 'NSFW Foolz': {
@ -8044,6 +8044,14 @@
'boards': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv'], 'boards': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv'],
'files': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv'] 'files': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv']
}, },
'World Athletic Project': {
'domain': 'fuuka.worldathleticproject.org',
'http': true,
'https': false,
'software': 'foolfuuka',
'boards': ['e', 'h', 'p', 's', 'u'],
'files': ['e', 'h', 'p', 's', 'u']
},
'Install Gentoo': { 'Install Gentoo': {
'domain': 'archive.installgentoo.net', 'domain': 'archive.installgentoo.net',
'http': false, 'http': false,
@ -8052,6 +8060,14 @@
'boards': ['diy', 'g', 'sci'], 'boards': ['diy', 'g', 'sci'],
'files': [] 'files': []
}, },
'warosu': {
'domain': 'fuuka.warosu.org',
'http': true,
'https': true,
'software': 'fuuka',
'boards': ['3', 'cgl', 'ck', 'fa', 'ic', 'jp', 'lit', 'q', 'tg', 'vr'],
'files': ['3', 'cgl', 'ck', 'fa', 'ic', 'jp', 'lit', 'q', 'tg', 'vr']
},
'Rebecca Black Tech': { 'Rebecca Black Tech': {
'domain': 'rbt.asia', 'domain': 'rbt.asia',
'http': true, 'http': true,

2
builds/crx/manifest.json
View File

@ -1,6 +1,6 @@
{ {
"name": "4chan X", "name": "4chan X",
"version": "1.2.19", "version": "1.2.24",
"manifest_version": 2, "manifest_version": 2,
"description": "Cross-browser userscript for maximum lurking on 4chan.", "description": "Cross-browser userscript for maximum lurking on 4chan.",
"icons": { "icons": {

48
builds/crx/script.js
View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript // Generated by CoffeeScript
/* /*
* 4chan X - Version 1.2.19 - 2013-07-21 * 4chan X - Version 1.2.24 - 2013-07-24
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
@ -107,7 +107,7 @@
'404 Redirect': [true, 'Redirect dead threads and images.'], '404 Redirect': [true, 'Redirect dead threads and images.'],
'Keybinds': [true, 'Bind actions to keyboard shortcuts.'], 'Keybinds': [true, 'Bind actions to keyboard shortcuts.'],
'Time Formatting': [true, 'Localize and format timestamps.'], 'Time Formatting': [true, 'Localize and format timestamps.'],
'Relative Post Dates': [false, 'Display dates like "3 minutes ago". Tooltip shows the timestamp.'], 'Relative Post Dates': [true, 'Display dates like "3 minutes ago". Tooltip shows the timestamp.'],
'File Info Formatting': [true, 'Reformat the file information.'], 'File Info Formatting': [true, 'Reformat the file information.'],
'Comment Expansion': [true, 'Add buttons to expand long comments.'], 'Comment Expansion': [true, 'Add buttons to expand long comments.'],
'Thread Expansion': [true, 'Add buttons to expand threads.'], 'Thread Expansion': [true, 'Add buttons to expand threads.'],
@ -130,14 +130,14 @@
'Anonymize': [false, 'Make everyone Anonymous.'], 'Anonymize': [false, 'Make everyone Anonymous.'],
'Filter': [true, 'Self-moderation placebo.'], 'Filter': [true, 'Self-moderation placebo.'],
'Recursive Hiding': [true, 'Hide replies of hidden posts, recursively.'], 'Recursive Hiding': [true, 'Hide replies of hidden posts, recursively.'],
'Thread Hiding Buttons': [true, 'Add buttons to hide entire threads.'], 'Thread Hiding Buttons': [false, 'Add buttons to hide entire threads.'],
'Reply Hiding Buttons': [true, 'Add buttons to hide single replies.'], 'Reply Hiding Buttons': [false, 'Add buttons to hide single replies.'],
'Filtered Backlinks': [true, 'When enabled, shows backlinks to filtered posts with a line-through decoration. Otherwise, hides the backlinks.'], 'Filtered Backlinks': [true, 'When enabled, shows backlinks to filtered posts with a line-through decoration. Otherwise, hides the backlinks.'],
'Stubs': [true, 'Show stubs of hidden threads / replies.'] 'Stubs': [true, 'Show stubs of hidden threads / replies.']
}, },
'Images': { 'Images': {
'Image Expansion': [true, 'Expand images.'], 'Image Expansion': [true, 'Expand images.'],
'Image Hover': [false, 'Show full image on mouseover.'], 'Image Hover': [true, 'Show full image on mouseover.'],
'Sauce': [true, 'Add sauce links to images.'], 'Sauce': [true, 'Add sauce links to images.'],
'Reveal Spoilers': [false, 'Reveal spoiler thumbnails.'], 'Reveal Spoilers': [false, 'Reveal spoiler thumbnails.'],
'Replace GIF': [false, 'Replace thumbnail of gifs with its actual image.'], 'Replace GIF': [false, 'Replace thumbnail of gifs with its actual image.'],
@ -167,14 +167,14 @@
'Page Count in Stats': [false, 'Display the page count in the thread stats as well.'], 'Page Count in Stats': [false, 'Display the page count in the thread stats as well.'],
'Updater and Stats in Header': [true, 'Places the thread updater and thread stats in the header instead of floating them.'], 'Updater and Stats in Header': [true, 'Places the thread updater and thread stats in the header instead of floating them.'],
'Thread Watcher': [true, 'Bookmark threads.'], 'Thread Watcher': [true, 'Bookmark threads.'],
'Toggleable Thread Watcher': [false, 'Adds a shortcut for the thread watcher, hides the watcher by default, and makes it scroll with the page.'], 'Toggleable Thread Watcher': [true, 'Adds a shortcut for the thread watcher, hides the watcher by default, and makes it scroll with the page.'],
'Auto Watch': [true, 'Automatically watch threads you start.'], 'Auto Watch': [true, 'Automatically watch threads you start.'],
'Auto Watch Reply': [false, 'Automatically watch threads you reply to.'] 'Auto Watch Reply': [false, 'Automatically watch threads you reply to.']
}, },
'Posting': { 'Posting': {
'Quick Reply': [true, 'All-in-one form to reply, create threads, automate dumping and more.'], 'Quick Reply': [true, 'All-in-one form to reply, create threads, automate dumping and more.'],
'Persistent QR': [false, 'The Quick reply won\'t disappear after posting.'], 'Persistent QR': [true, 'The Quick reply won\'t disappear after posting.'],
'Auto Hide QR': [false, 'Automatically hide the quick reply when posting.'], 'Auto Hide QR': [true, 'Automatically hide the quick reply when posting.'],
'Open Post in New Tab': [true, 'Open new threads or replies to a thread from the index in a new tab.'], 'Open Post in New Tab': [true, 'Open new threads or replies to a thread from the index in a new tab.'],
'Remember Subject': [false, 'Remember the subject field, instead of resetting after posting.'], 'Remember Subject': [false, 'Remember the subject field, instead of resetting after posting.'],
'Remember Spoiler': [false, 'Remember the spoiler state, instead of resetting after posting.'], 'Remember Spoiler': [false, 'Remember the spoiler state, instead of resetting after posting.'],
@ -199,14 +199,14 @@
'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': [false, 'Thread conversations'] 'Quote Threading': [true, 'Thread conversations']
} }
}, },
imageExpansion: { imageExpansion: {
'Fit width': [true, ''], 'Fit width': [false, ''],
'Fit height': [false, ''], 'Fit height': [false, ''],
'Expand spoilers': [true, 'Expand all images along with spoilers.'], 'Expand spoilers': [true, 'Expand all images along with spoilers.'],
'Expand from here': [true, 'Expand all images only from current position to thread end.'], 'Expand from here': [false, 'Expand all images only from current position to thread end.'],
'Advance on contract': [false, 'Advance to next post when contracting an expanded image.'] 'Advance on contract': [false, 'Advance to next post when contracting an expanded image.']
}, },
filter: { filter: {
@ -236,7 +236,7 @@
'Bottom Board List': true, 'Bottom Board List': true,
'Custom Board Navigation': true 'Custom Board Navigation': true
}, },
boardnav: "[ toggle-all ]\n[current-title]\n[external-text:\"FAQ\",\"https://github.com/seaweedchan/4chan-x/wiki/Frequently-Asked-Questions\"]", boardnav: "[ toggle-all ]\na-replace\nc-replace\ng-replace\nk-replace\nv-replace\nvg-replace\nvr-replace\nck-replace\nco-replace\nfit-replace\njp-replace\nmu-replace\nsp-replace\ntv-replace\nvp-replace\nq-replace\n[external-text:\"FAQ\",\"https://github.com/seaweedchan/4chan-x/wiki/Frequently-Asked-Questions\"]",
QR: { QR: {
'QR.personas': "#email:\"sage\";boards:jp;always" 'QR.personas': "#email:\"sage\";boards:jp;always"
}, },
@ -300,7 +300,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.2.19', VERSION: '1.2.24',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {}, boards: {},
threads: {}, threads: {},
@ -4672,7 +4672,7 @@
} }
$.ready(this.initReady); $.ready(this.initReady);
if (Conf['Persistent QR']) { if (Conf['Persistent QR']) {
if (g.BOARD.ID !== 'f') { if (!(g.BOARD.ID === 'f' && g.VIEW === 'index')) {
$.on(d, '4chanXInitFinished', this.persist); $.on(d, '4chanXInitFinished', this.persist);
} else { } else {
$.ready(this.persist); $.ready(this.persist);
@ -5924,7 +5924,7 @@
QR.cooldown.auto = false; QR.cooldown.auto = false;
QR.status(); QR.status();
return QR.error($.el('span', { return QR.error($.el('span', {
innerHTML: "Connection error. You may have been <a href=//www.4chan.org/banned target=_blank>banned</a>.\n[<a href=\"https://github.com/MayhemYDG/4chan-x/wiki/FAQ#what-does-connection-error-you-may-have-been-banned-mean\" target=_blank>FAQ</a>]" innerHTML: "4chan X encountered an error while posting. Please try again. \n[<a href=\"https://github.com/seaweedchan/4chan-x/wiki/Frequently-Asked-Questions#what-does-4chan-x-encountered-an-error-while-posting-please-try-again-mean\" target=_blank>?</a>]"
})); }));
} }
}; };
@ -7983,7 +7983,7 @@
'http': false, 'http': false,
'https': true, 'https': true,
'software': 'foolfuuka', 'software': 'foolfuuka',
'boards': ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'vg', 'vp', 'vr', 'wsg'], 'boards': ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'vp', 'vr', 'wsg'],
'files': ['a', 'gd', 'jp', 'm', 'q', 'tg', 'vg', 'vp', 'vr', 'wsg'] 'files': ['a', 'gd', 'jp', 'm', 'q', 'tg', 'vg', 'vp', 'vr', 'wsg']
}, },
'NSFW Foolz': { 'NSFW Foolz': {
@ -8025,6 +8025,14 @@
'boards': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv'], 'boards': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv'],
'files': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv'] 'files': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv']
}, },
'World Athletic Project': {
'domain': 'fuuka.worldathleticproject.org',
'http': true,
'https': false,
'software': 'foolfuuka',
'boards': ['e', 'h', 'p', 's', 'u'],
'files': ['e', 'h', 'p', 's', 'u']
},
'Install Gentoo': { 'Install Gentoo': {
'domain': 'archive.installgentoo.net', 'domain': 'archive.installgentoo.net',
'http': false, 'http': false,
@ -8033,6 +8041,14 @@
'boards': ['diy', 'g', 'sci'], 'boards': ['diy', 'g', 'sci'],
'files': [] 'files': []
}, },
'warosu': {
'domain': 'fuuka.warosu.org',
'http': true,
'https': true,
'software': 'fuuka',
'boards': ['3', 'cgl', 'ck', 'fa', 'ic', 'jp', 'lit', 'q', 'tg', 'vr'],
'files': ['3', 'cgl', 'ck', 'fa', 'ic', 'jp', 'lit', 'q', 'tg', 'vr']
},
'Rebecca Black Tech': { 'Rebecca Black Tech': {
'domain': 'rbt.asia', 'domain': 'rbt.asia',
'http': true, 'http': true,

2
latest.js
View File

@ -1 +1 @@
postMessage({version:'1.2.19'},'*') postMessage({version:'1.2.24'},'*')

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "4chan-X", "name": "4chan-X",
"version": "1.2.19", "version": "1.2.24",
"description": "Cross-browser userscript for maximum lurking on 4chan.", "description": "Cross-browser userscript for maximum lurking on 4chan.",
"meta": { "meta": {
"name": "4chan X", "name": "4chan X",

18
src/Archive/Redirect.coffee
View File

@ -28,7 +28,7 @@ Redirect =
'http': false 'http': false
'https': true 'https': true
'software': 'foolfuuka' 'software': 'foolfuuka'
'boards': ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'vg', 'vp', 'vr', 'wsg'] 'boards': ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'vp', 'vr', 'wsg']
'files': ['a', 'gd', 'jp', 'm', 'q', 'tg', 'vg', 'vp', 'vr', 'wsg'] 'files': ['a', 'gd', 'jp', 'm', 'q', 'tg', 'vg', 'vp', 'vr', 'wsg']
'NSFW Foolz': 'NSFW Foolz':
@ -70,6 +70,14 @@ Redirect =
'boards': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv'] 'boards': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv']
'files': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv'] 'files': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv']
'World Athletic Project':
'domain': 'fuuka.worldathleticproject.org'
'http': true
'https': false
'software': 'foolfuuka'
'boards': ['e', 'h', 'p', 's', 'u']
'files': ['e', 'h', 'p', 's', 'u']
'Install Gentoo': 'Install Gentoo':
'domain': 'archive.installgentoo.net' 'domain': 'archive.installgentoo.net'
'http': false 'http': false
@ -78,6 +86,14 @@ Redirect =
'boards': ['diy', 'g', 'sci'] 'boards': ['diy', 'g', 'sci']
'files': [] 'files': []
'warosu':
'domain': 'fuuka.warosu.org'
'http': true
'https': true
'software': 'fuuka'
'boards': ['3', 'cgl', 'ck', 'fa', 'ic', 'jp', 'lit', 'q', 'tg', 'vr']
'files': ['3', 'cgl', 'ck', 'fa', 'ic', 'jp', 'lit', 'q', 'tg', 'vr']
'Rebecca Black Tech': 'Rebecca Black Tech':
'domain': 'rbt.asia' 'domain': 'rbt.asia'
'http': true 'http': true

37
src/General/Config.coffee
View File

@ -30,7 +30,7 @@ Config =
'Localize and format timestamps.' 'Localize and format timestamps.'
] ]
'Relative Post Dates': [ 'Relative Post Dates': [
false true
'Display dates like "3 minutes ago". Tooltip shows the timestamp.' 'Display dates like "3 minutes ago". Tooltip shows the timestamp.'
] ]
'File Info Formatting': [ 'File Info Formatting': [
@ -116,11 +116,11 @@ Config =
'Hide replies of hidden posts, recursively.' 'Hide replies of hidden posts, recursively.'
] ]
'Thread Hiding Buttons': [ 'Thread Hiding Buttons': [
true false
'Add buttons to hide entire threads.' 'Add buttons to hide entire threads.'
] ]
'Reply Hiding Buttons': [ 'Reply Hiding Buttons': [
true false
'Add buttons to hide single replies.' 'Add buttons to hide single replies.'
] ]
'Filtered Backlinks': [ 'Filtered Backlinks': [
@ -138,7 +138,7 @@ Config =
'Expand images.' 'Expand images.'
] ]
'Image Hover': [ 'Image Hover': [
false true
'Show full image on mouseover.' 'Show full image on mouseover.'
] ]
'Sauce': [ 'Sauce': [
@ -248,7 +248,7 @@ Config =
'Bookmark threads.' 'Bookmark threads.'
] ]
'Toggleable Thread Watcher': [ 'Toggleable Thread Watcher': [
false true
'Adds a shortcut for the thread watcher, hides the watcher by default, and makes it scroll with the page.' 'Adds a shortcut for the thread watcher, hides the watcher by default, and makes it scroll with the page.'
] ]
'Auto Watch': [ 'Auto Watch': [
@ -266,11 +266,11 @@ Config =
'All-in-one form to reply, create threads, automate dumping and more.' 'All-in-one form to reply, create threads, automate dumping and more.'
] ]
'Persistent QR': [ 'Persistent QR': [
false true
'The Quick reply won\'t disappear after posting.' 'The Quick reply won\'t disappear after posting.'
] ]
'Auto Hide QR': [ 'Auto Hide QR': [
false true
'Automatically hide the quick reply when posting.' 'Automatically hide the quick reply when posting.'
] ]
'Open Post in New Tab': [ 'Open Post in New Tab': [
@ -370,13 +370,13 @@ Config =
'Add \'(Cross-thread)\' to cross-threads quotes.' 'Add \'(Cross-thread)\' to cross-threads quotes.'
] ]
'Quote Threading': [ 'Quote Threading': [
false true
'Thread conversations' 'Thread conversations'
] ]
imageExpansion: imageExpansion:
'Fit width': [ 'Fit width': [
true false
'' ''
] ]
'Fit height': [ 'Fit height': [
@ -388,7 +388,7 @@ Config =
'Expand all images along with spoilers.' 'Expand all images along with spoilers.'
] ]
'Expand from here': [ 'Expand from here': [
true false
'Expand all images only from current position to thread end.' 'Expand all images only from current position to thread end.'
] ]
'Advance on contract': [ 'Advance on contract': [
@ -476,7 +476,22 @@ http://iqdb.org/?url=%TURL
boardnav: """ boardnav: """
[ toggle-all ] [ toggle-all ]
[current-title] a-replace
c-replace
g-replace
k-replace
v-replace
vg-replace
vr-replace
ck-replace
co-replace
fit-replace
jp-replace
mu-replace
sp-replace
tv-replace
vp-replace
q-replace
[external-text:"FAQ","https://github.com/seaweedchan/4chan-x/wiki/Frequently-Asked-Questions"] [external-text:"FAQ","https://github.com/seaweedchan/4chan-x/wiki/Frequently-Asked-Questions"]
""" """

7
src/Posting/QuickReply.coffee
View File

@ -28,7 +28,7 @@ QR =
$.ready @initReady $.ready @initReady
if Conf['Persistent QR'] if Conf['Persistent QR']
unless g.BOARD.ID is 'f' unless g.BOARD.ID is 'f' and g.VIEW is 'index'
$.on d, '4chanXInitFinished', @persist $.on d, '4chanXInitFinished', @persist
else else
$.ready @persist $.ready @persist
@ -766,6 +766,7 @@ QR =
$.on input, 'keydown', @keydown.bind @ $.on input, 'keydown', @keydown.bind @
$.on input, 'focus', -> $.addClass QR.nodes.el, 'focus' $.on input, 'focus', -> $.addClass QR.nodes.el, 'focus'
$.on input, 'blur', -> $.rmClass QR.nodes.el, 'focus' $.on input, 'blur', -> $.rmClass QR.nodes.el, 'focus'
$.get 'captchas', [], ({captchas}) => $.get 'captchas', [], ({captchas}) =>
@sync captchas @sync captchas
$.sync 'captchas', @sync $.sync 'captchas', @sync
@ -1056,8 +1057,8 @@ QR =
QR.status() QR.status()
QR.error $.el 'span', QR.error $.el 'span',
innerHTML: """ innerHTML: """
Connection error. You may have been <a href=//www.4chan.org/banned target=_blank>banned</a>. 4chan X encountered an error while posting. Please try again.
[<a href="https://github.com/MayhemYDG/4chan-x/wiki/FAQ#what-does-connection-error-you-may-have-been-banned-mean" target=_blank>FAQ</a>] [<a href="https://github.com/seaweedchan/4chan-x/wiki/Frequently-Asked-Questions#what-does-4chan-x-encountered-an-error-while-posting-please-try-again-mean" target=_blank>?</a>]
""" """
opts = opts =
cred: true cred: true