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

Merge branch 'ccd0' into v3

Browse Source 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Build.coffee
	src/Miscellaneous/ExpandThread.coffee
This commit is contained in:
Zixaphir 2014-04-07 11:26:21 -07:00
commit d215221c71
10 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGELOG.md
View File

@ -1,3 +1,16 @@
### v1.7.2
*2014-04-07*
**ccd0**
- Restore thread expansion with JSON navigation disabled.
### v1.7.1
*2014-04-06*
**ccd0**
- Fix minimum width bug.
- `JSON Navigation` is now disabled by default.
## v1.7.0 ## v1.7.0
*2014-04-06* *2014-04-06*

2
LICENSE
View File

@ -1,5 +1,5 @@
/* /*
* 4chan X - Version 1.7.0 - 2014-04-07 * 4chan X - Version 1.7.2 - 2014-04-07
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE * https://github.com/ccd0/4chan-x/blob/master/LICENSE

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

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

7
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.7.0 // @version 1.7.2
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -24,7 +24,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* 4chan X - Version 1.7.0 - 2014-04-07 * 4chan X - Version 1.7.2 - 2014-04-07
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@ -373,7 +373,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.7.0', VERSION: '1.7.2',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -6820,7 +6820,6 @@
} else { } else {
if (QR.posts.length > 1) { if (QR.posts.length > 1) {
QR.captcha.setup(); QR.captcha.setup();
QR.captcha.afterSetup();
} }
post.rm(); post.rm();
} }

2
builds/crx/manifest.json
View File

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

5
builds/crx/script.js
View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript // Generated by CoffeeScript
/* /*
* 4chan X - Version 1.7.0 - 2014-04-07 * 4chan X - Version 1.7.2 - 2014-04-07
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@ -349,7 +349,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.7.0', VERSION: '1.7.2',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -6865,7 +6865,6 @@
} else { } else {
if (QR.posts.length > 1) { if (QR.posts.length > 1) {
QR.captcha.setup(); QR.captcha.setup();
QR.captcha.afterSetup();
} }
post.rm(); post.rm();
} }

2
builds/updates.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'> <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'> <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://ccd0.github.io/4chan-x/builds/crx.crx' version='1.7.0' /> <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/crx.crx' version='1.7.2' />
</app> </app>
</gupdate> </gupdate>

2
latest.js
View File

@ -1 +1 @@
postMessage({version:'1.7.0'},'*') postMessage({version:'1.7.2'},'*')

2
package.json
View File

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

1
src/Posting/QR.coffee
View File

@ -795,7 +795,6 @@ QR =
else else
if QR.posts.length > 1 if QR.posts.length > 1
QR.captcha.setup() QR.captcha.setup()
QR.captcha.afterSetup()
post.rm() post.rm()
QR.cooldown.set {req, post, isReply, threadID} QR.cooldown.set {req, post, isReply, threadID}