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
This commit is contained in:
Zixaphir 2013-08-04 19:02:55 -07:00
commit a54bc6a076
12 changed files with 431 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -1,9 +1,15 @@
**MayhemYDG**: **MayhemYDG**:
- Fix impossibility to create new threads when in dead threads. - Fix impossibility to create new threads when in dead threads.
- Drop Opera <15 support.
- Fix flag filtering on /sp/ and /int/. - Fix flag filtering on /sp/ and /int/.
- Minor fixes. - Minor fixes.
### v1.2.25
*2013-08-04*
**seaweedchan**:
- Fix issues with having two options called `Reveal Spoilers`.
- Update archive.
### v1.2.24 ### v1.2.24
*2013-07-24* *2013-07-24*

2
LICENSE
View File

@ -1,5 +1,5 @@
/* /*
* 4chan X - Version 1.2.24 - 2013-08-04 * 4chan X - Version 1.2.25 - 2013-08-04
* *
* 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

406
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.24 // @version 1.2.25
// @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

16
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.24 // @version 1.2.25
// @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.24 - 2013-08-04 * 4chan X - Version 1.2.25 - 2013-08-04
* *
* 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
@ -159,7 +159,7 @@
'Image Expansion': [true, 'Expand images.'], 'Image Expansion': [true, 'Expand images.'],
'Image Hover': [true, '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 Spoiler Thumbnails': [false, 'Replace spoiler thumbnails with the original image.'],
'Replace GIF': [false, 'Replace thumbnail of gifs with its actual image.'], 'Replace GIF': [false, 'Replace thumbnail of gifs with its actual image.'],
'Replace PNG': [false, 'Replace pngs.'], 'Replace PNG': [false, 'Replace pngs.'],
'Replace JPG': [false, 'Replace jpgs.'], 'Replace JPG': [false, 'Replace jpgs.'],
@ -320,7 +320,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.2.24', VERSION: '1.2.25',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {}, boards: {},
threads: {}, threads: {},
@ -6577,11 +6577,11 @@
RevealSpoilers = { RevealSpoilers = {
init: function() { init: function() {
if (g.VIEW === 'catalog' || !Conf['Reveal Spoilers']) { if (g.VIEW === 'catalog' || !Conf['Reveal Spoiler Thumbnails']) {
return; return;
} }
return Post.prototype.callbacks.push({ return Post.prototype.callbacks.push({
name: 'Reveal Spoilers', name: 'Reveal Spoiler Thumbnails',
cb: this.node cb: this.node
}); });
}, },
@ -8073,8 +8073,8 @@
'http': true, 'http': true,
'https': false, 'https': false,
'software': 'foolfuuka', 'software': 'foolfuuka',
'boards': ['e', 'h', 'p', 's', 'u'], 'boards': ['e', 'h', 'hc', 'p', 's', 'u'],
'files': ['e', 'h', 'p', 's', 'u'] 'files': ['e', 'h', 'hc', 'p', 's', 'u']
}, },
'Install Gentoo': { 'Install Gentoo': {
'domain': 'archive.installgentoo.net', 'domain': 'archive.installgentoo.net',

2
builds/crx/manifest.json
View File

@ -1,6 +1,6 @@
{ {
"name": "4chan X", "name": "4chan X",
"version": "1.2.24", "version": "1.2.25",
"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": {

14
builds/crx/script.js
View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript // Generated by CoffeeScript
/* /*
* 4chan X - Version 1.2.24 - 2013-08-04 * 4chan X - Version 1.2.25 - 2013-08-04
* *
* 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
@ -139,7 +139,7 @@
'Image Expansion': [true, 'Expand images.'], 'Image Expansion': [true, 'Expand images.'],
'Image Hover': [true, '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 Spoiler Thumbnails': [false, 'Replace spoiler thumbnails with the original image.'],
'Replace GIF': [false, 'Replace thumbnail of gifs with its actual image.'], 'Replace GIF': [false, 'Replace thumbnail of gifs with its actual image.'],
'Replace PNG': [false, 'Replace pngs.'], 'Replace PNG': [false, 'Replace pngs.'],
'Replace JPG': [false, 'Replace jpgs.'], 'Replace JPG': [false, 'Replace jpgs.'],
@ -300,7 +300,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.2.24', VERSION: '1.2.25',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {}, boards: {},
threads: {}, threads: {},
@ -6555,11 +6555,11 @@
RevealSpoilers = { RevealSpoilers = {
init: function() { init: function() {
if (g.VIEW === 'catalog' || !Conf['Reveal Spoilers']) { if (g.VIEW === 'catalog' || !Conf['Reveal Spoiler Thumbnails']) {
return; return;
} }
return Post.prototype.callbacks.push({ return Post.prototype.callbacks.push({
name: 'Reveal Spoilers', name: 'Reveal Spoiler Thumbnails',
cb: this.node cb: this.node
}); });
}, },
@ -8056,8 +8056,8 @@
'http': true, 'http': true,
'https': false, 'https': false,
'software': 'foolfuuka', 'software': 'foolfuuka',
'boards': ['e', 'h', 'p', 's', 'u'], 'boards': ['e', 'h', 'hc', 'p', 's', 'u'],
'files': ['e', 'h', 'p', 's', 'u'] 'files': ['e', 'h', 'hc', 'p', 's', 'u']
}, },
'Install Gentoo': { 'Install Gentoo': {
'domain': 'archive.installgentoo.net', 'domain': 'archive.installgentoo.net',

2
latest.js
View File

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

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "4chan-X", "name": "4chan-X",
"version": "1.2.24", "version": "1.2.25",
"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",

4
src/Archive/Redirect.coffee
View File

@ -73,8 +73,8 @@ Redirect =
'http': true 'http': true
'https': false 'https': false
'software': 'foolfuuka' 'software': 'foolfuuka'
'boards': ['e', 'h', 'p', 's', 'u'] 'boards': ['e', 'h', 'hc', 'p', 's', 'u']
'files': ['e', 'h', 'p', 's', 'u'] 'files': ['e', 'h', 'hc', 'p', 's', 'u']
'Install Gentoo': 'Install Gentoo':
'domain': 'archive.installgentoo.net' 'domain': 'archive.installgentoo.net'

4
src/General/Config.coffee
View File

@ -145,9 +145,9 @@ Config =
true true
'Add sauce links to images.' 'Add sauce links to images.'
] ]
'Reveal Spoilers': [ 'Reveal Spoiler Thumbnails': [
false false
'Reveal spoiler thumbnails.' 'Replace spoiler thumbnails with the original image.'
] ]
'Replace GIF': [ 'Replace GIF': [
false false

4
src/Images/RevealSpoilers.coffee
View File

@ -1,9 +1,9 @@
RevealSpoilers = RevealSpoilers =
init: -> init: ->
return if g.VIEW is 'catalog' or !Conf['Reveal Spoilers'] return if g.VIEW is 'catalog' or !Conf['Reveal Spoiler Thumbnails']
Post::callbacks.push Post::callbacks.push
name: 'Reveal Spoilers' name: 'Reveal Spoiler Thumbnails'
cb: @node cb: @node
node: -> node: ->
return if @isClone or !@file?.isSpoiler return if @isClone or !@file?.isSpoiler