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

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

Browse Source 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/Index.coffee
	src/Posting/QR.coffee
This commit is contained in:
Zixaphir 2014-02-28 19:37:26 -07:00
commit 553a5a9133
16 changed files with 1810 additions and 928 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CHANGELOG.md
View File

@ -45,18 +45,20 @@
- Added `Original filename` variable to Sauce panel.
- Fixed a bug which prevented QR cooldowns from being pruned from storage.
- On Chrome, the storage could reach the quota and prevent 4chan X from saving data like QR name/mail or auto-watch for example.
- Added a `Reset Settings` button in the settings.
## v1.4.0
*2014-02-24*
**MayhemYDG**:
- Added a Reset Settings button in the settings.
- More stability update.
- Stability update.
**ParrotParrot**:
- Added `Original filename` variable to Sauce panel.
### v1.3.10
*2014-02-20*
**Spittie**
- I keep breaking and fixing stuff. But mostly breaking.
**Zixaphir**:
- Merge changes from Mayhem fork
### v1.3.9
*2014-02-20*

2
LICENSE
View File

@ -1,5 +1,5 @@
/*
* 4chan X - Version 1.3.10 - 2014-02-28
* 4chan X - Version 1.4.0 - 2014-02-28
*
* Licensed under the MIT license.
* https://github.com/Spittie/4chan-x/blob/master/LICENSE

2
README.md
View File

@ -4,7 +4,7 @@ Personal fork of Seaweed's 4chan X.
##[Install](https://github.com/Spittie/4chan-x/raw/master/builds/4chan-X.user.js) (Firefox)
##[Install](https://github.com/Spittie/4chan-x/raw/master/builds/crx.crx) (Chrom*)
##[Install](http://a.pomf.se/ermdzx.xpi) (Firefox Mobile)
##[Install](http://a.pomf.se/iazopu.xpi) (Firefox Mobile)
## If you have any problems, try resetting your 4chan X settings before calling me a faggot (but feel free to do so)

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

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
// @version 1.3.10
// @version 1.4.0
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X

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

@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
// @version 1.3.10
// @version 1.4.0
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -24,7 +24,7 @@
// ==/UserScript==
/*
* 4chan X - Version 1.3.10 - 2014-02-28
* 4chan X - Version 1.4.0 - 2014-02-28
*
* Licensed under the MIT license.
* https://github.com/Spittie/4chan-x/blob/master/LICENSE
@ -368,7 +368,7 @@
doc = d.documentElement;
g = {
VERSION: '1.3.10',
VERSION: '1.4.0',
NAMESPACE: '4chan X.',
boards: {}
};
@ -3060,7 +3060,7 @@
return Math.max(0, Index.getPagesNum() - 1);
},
togglePagelist: function() {
return Index.pagelist.hidden = Conf['Index Mode'] === 'all pages';
return Index.pagelist.hidden = Conf['Index Mode'] !== 'paged';
},
buildPagelist: function() {
var a, i, maxPageNum, nodes, pagesRoot, _i;
@ -6053,6 +6053,14 @@
$.on(d, 'drop', QR.dropFile);
$.on(d, 'dragstart dragend', QR.drag);
({
catalog: function() {
if (Conf["Persistent QR"]) {
QR.open();
}
if (Conf['Auto Hide QR']) {
return QR.hide();
}
},
index: function() {
return $.on(d, 'IndexRefresh', QR.generatePostableThreadsList);
},
@ -6748,6 +6756,8 @@
if (/captcha|verification/i.test(err.textContent) || err === 'Connection error with sys.4chan.org.') {
if (/mistyped/i.test(err.textContent)) {
err = 'You seem to have mistyped the CAPTCHA.';
} else if (/expired/i.test(err.textContent)) {
err = 'This CAPTCHA is no longer valid because it has expired.';
}
QR.cooldown.auto = QR.captcha.isEnabled ? !!QR.captcha.captchas.length : err === 'Connection error with sys.4chan.org.' ? true : false;
QR.cooldown.set({
@ -10850,16 +10860,6 @@
https: true,
software: "foolfuuka"
}
}, {
name: "Install Gentoo",
boards: ["diy", "g", "sci"],
files: [],
data: {
domain: "archive.installgentoo.net",
http: false,
https: true,
software: "fuuka"
}
}, {
name: "Rebecca Black Tech",
boards: ["cgl", "g", "mu", "w"],

BIN
builds/crx.crx
View File

Binary file not shown.

2
builds/crx/manifest.json
View File

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

26
builds/crx/script.js
View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript
/*
* 4chan X - Version 1.3.10 - 2014-02-28
* 4chan X - Version 1.4.0 - 2014-02-28
*
* Licensed under the MIT license.
* https://github.com/Spittie/4chan-x/blob/master/LICENSE
@ -344,7 +344,7 @@
doc = d.documentElement;
g = {
VERSION: '1.3.10',
VERSION: '1.4.0',
NAMESPACE: '4chan X.',
boards: {}
};
@ -3111,7 +3111,7 @@
return Math.max(0, Index.getPagesNum() - 1);
},
togglePagelist: function() {
return Index.pagelist.hidden = Conf['Index Mode'] === 'all pages';
return Index.pagelist.hidden = Conf['Index Mode'] !== 'paged';
},
buildPagelist: function() {
var a, i, maxPageNum, nodes, pagesRoot, _i;
@ -6098,6 +6098,14 @@
$.on(d, 'drop', QR.dropFile);
$.on(d, 'dragstart dragend', QR.drag);
({
catalog: function() {
if (Conf["Persistent QR"]) {
QR.open();
}
if (Conf['Auto Hide QR']) {
return QR.hide();
}
},
index: function() {
return $.on(d, 'IndexRefresh', QR.generatePostableThreadsList);
},
@ -6783,6 +6791,8 @@
if (/captcha|verification/i.test(err.textContent) || err === 'Connection error with sys.4chan.org.') {
if (/mistyped/i.test(err.textContent)) {
err = 'You seem to have mistyped the CAPTCHA.';
} else if (/expired/i.test(err.textContent)) {
err = 'This CAPTCHA is no longer valid because it has expired.';
}
QR.cooldown.auto = QR.captcha.isEnabled ? !!QR.captcha.captchas.length : err === 'Connection error with sys.4chan.org.' ? true : false;
QR.cooldown.set({
@ -10856,16 +10866,6 @@
https: true,
software: "foolfuuka"
}
}, {
name: "Install Gentoo",
boards: ["diy", "g", "sci"],
files: [],
data: {
domain: "archive.installgentoo.net",
http: false,
https: true,
software: "fuuka"
}
}, {
name: "Rebecca Black Tech",
boards: ["cgl", "g", "mu", "w"],

BIN
builds/xpi/4chanx.xpi
View File

Binary file not shown.

2591
builds/xpi/data/4chan-X.user.js
View File

File diff suppressed because one or more lines are too long

2
latest.js
View File

@ -1 +1 @@
postMessage({version:'1.3.10'},'*')
postMessage({version:'1.4.0'},'*')

2
package.json
View File

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

9
src/Archive/Redirect.coffee
View File

@ -76,15 +76,6 @@ Redirect =
http: true
https: true
software: "foolfuuka"
,
name: "Install Gentoo"
boards: ["diy", "g", "sci"]
files: []
data:
domain: "archive.installgentoo.net"
http: false
https: true
software: "fuuka"
,
name: "Rebecca Black Tech"
boards: ["cgl", "g", "mu", "w"]

2
src/General/Index.coffee
View File

@ -421,7 +421,7 @@ Index =
Math.max 0, Index.getPagesNum() - 1
togglePagelist: ->
Index.pagelist.hidden = Conf['Index Mode'] is 'all pages'
Index.pagelist.hidden = Conf['Index Mode'] isnt 'paged'
buildPagelist: ->
pagesRoot = $ '.pages', Index.pagelist

5
src/General/Navigate.coffee
View File

@ -3,8 +3,9 @@ Navigate =
init: ->
return if g.VIEW is 'catalog' or g.BOARD.ID is 'f' or !Conf['JSON Navigation']
# blink/webkit throw a popstate on page load. Not what we want.
$.ready -> $.on window, 'popstate', Navigate.popstate
$.ready ->
# blink/webkit throw a popstate on page load. Not what we want.
$.on window, 'popstate', Navigate.popstate
@title = -> return

51
src/Posting/QR.coffee
View File

@ -72,6 +72,9 @@ QR =
$.on d, 'drop', QR.dropFile
$.on d, 'dragstart dragend', QR.drag
{
catalog: ->
QR.open() if Conf["Persistent QR"]
QR.hide() if Conf['Auto Hide QR']
index: ->
$.on d, 'IndexRefresh', QR.generatePostableThreadsList
thread: ->
@ -434,30 +437,30 @@ QR =
el: dialog = UI.dialog 'qr', 'top:0;right:0;', <%= importHTML('Features/QuickReply') %>
nodes[val[0]] = $ val[1], dialog for val in [
['move', '.move']
['autohide', '#autohide']
['thread', 'select']
['threadPar', '#qr-thread-select']
['close', '.close']
['form', 'form']
['dumpButton', '#dump-button']
['urlButton', '#url-button']
['name', '[data-name=name]']
['email', '[data-name=email]']
['sub', '[data-name=sub]']
['com', '[data-name=com]']
['dumpList', '#dump-list']
['addPost', '#add-post']
['charCount', '#char-count']
['fileSubmit', '#file-n-submit']
['filesize', '#qr-filesize']
['filename', '#qr-filename']
['move', '.move']
['autohide', '#autohide']
['thread', 'select']
['threadPar', '#qr-thread-select']
['close', '.close']
['form', 'form']
['dumpButton', '#dump-button']
['urlButton', '#url-button']
['name', '[data-name=name]']
['email', '[data-name=email]']
['sub', '[data-name=sub]']
['com', '[data-name=com]']
['dumpList', '#dump-list']
['addPost', '#add-post']
['charCount', '#char-count']
['fileSubmit', '#file-n-submit']
['filesize', '#qr-filesize']
['filename', '#qr-filename']
['fileContainer', '#qr-filename-container']
['fileRM', '#qr-filerm']
['fileExtras', '#qr-extras-container']
['spoiler', '#qr-file-spoiler']
['status', '[type=submit]']
['fileInput', '[type=file]']
['fileRM', '#qr-filerm']
['fileExtras', '#qr-extras-container']
['spoiler', '#qr-file-spoiler']
['status', '[type=submit]']
['fileInput', '[type=file]']
]
nodes.fileInput.max = $('input[name=MAX_FILE_SIZE]').value
@ -730,6 +733,8 @@ QR =
# Remove the obnoxious 4chan Pass ad.
if /mistyped/i.test err.textContent
err = 'You seem to have mistyped the CAPTCHA.'
else if /expired/i.test err.textContent
err = 'This CAPTCHA is no longer valid because it has expired.'
# Enable auto-post if we have some cached captchas.
QR.cooldown.auto = if QR.captcha.isEnabled
!!QR.captcha.captchas.length