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

Merge branch 'captcha'

Browse Source
This commit is contained in:
ccd0 2016-02-12 17:29:07 -08:00
commit a7ff93d53f
14 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
### v1.11.25
**v1.11.25.1** *(2016-02-12)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.25.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.25.1/builds/4chan-X-noupdate.crx "Chromium version")]
- Bugfix for 2x4 image captcha.
**v1.11.25.0** *(2016-02-11)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.25.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.25.0/builds/4chan-X-noupdate.crx "Chromium version")]
- Based on v1.11.24.2.
- Support new 2x4 image captcha.

BIN
builds/4chan-X-beta.crx
View File

Binary file not shown.

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

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
// @version 1.11.25.0
// @version 1.11.25.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X

8
builds/4chan-X-beta.user.js
View File

@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X beta
// @version 1.11.25.0
// @version 1.11.25.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -436,7 +436,7 @@
doc = d.documentElement;
g = {
VERSION: '1.11.25.0',
VERSION: '1.11.25.1',
NAMESPACE: '4chan X.',
boards: {}
};
@ -8102,7 +8102,7 @@
ref = this.imageKeys16;
for (i = k = 0, len1 = ref.length; k < len1; i = ++k) {
key = ref[i];
if ((node = nodes[(Math.floor(i / 4)) * this.width + (i % 4)])) {
if (i % 4 < this.width && (node = nodes[nodes.length - (4 - Math.floor(i / 4)) * this.width + (i % 4)])) {
node.title = "" + (key[0].toUpperCase()) + key.slice(1);
}
}
@ -8141,7 +8141,7 @@
} else if (n === 9 && (i = this.imageKeys.indexOf(key)) >= 0) {
this.images[i % 9].click();
verify.focus();
} else if (n !== 9 && (i = this.imageKeys16.indexOf(key)) >= 0 && (img = this.images[(Math.floor(i / 4)) * w + (i % 4)])) {
} else if (n !== 9 && (i = this.imageKeys16.indexOf(key)) >= 0 && i % 4 < w && (img = this.images[n - (4 - Math.floor(i / 4)) * w + (i % 4)])) {
img.click();
verify.focus();
} else if (dx = {

BIN
builds/4chan-X-noupdate.crx
View File

Binary file not shown.

8
builds/4chan-X-noupdate.user.js
View File

@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
// @version 1.11.25.0
// @version 1.11.25.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -436,7 +436,7 @@
doc = d.documentElement;
g = {
VERSION: '1.11.25.0',
VERSION: '1.11.25.1',
NAMESPACE: '4chan X.',
boards: {}
};
@ -8102,7 +8102,7 @@
ref = this.imageKeys16;
for (i = k = 0, len1 = ref.length; k < len1; i = ++k) {
key = ref[i];
if ((node = nodes[(Math.floor(i / 4)) * this.width + (i % 4)])) {
if (i % 4 < this.width && (node = nodes[nodes.length - (4 - Math.floor(i / 4)) * this.width + (i % 4)])) {
node.title = "" + (key[0].toUpperCase()) + key.slice(1);
}
}
@ -8141,7 +8141,7 @@
} else if (n === 9 && (i = this.imageKeys.indexOf(key)) >= 0) {
this.images[i % 9].click();
verify.focus();
} else if (n !== 9 && (i = this.imageKeys16.indexOf(key)) >= 0 && (img = this.images[(Math.floor(i / 4)) * w + (i % 4)])) {
} else if (n !== 9 && (i = this.imageKeys16.indexOf(key)) >= 0 && i % 4 < w && (img = this.images[n - (4 - Math.floor(i / 4)) * w + (i % 4)])) {
img.click();
verify.focus();
} else if (dx = {

BIN
builds/4chan-X.crx
View File

Binary file not shown.

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

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

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

@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
// @version 1.11.25.0
// @version 1.11.25.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -436,7 +436,7 @@
doc = d.documentElement;
g = {
VERSION: '1.11.25.0',
VERSION: '1.11.25.1',
NAMESPACE: '4chan X.',
boards: {}
};
@ -8102,7 +8102,7 @@
ref = this.imageKeys16;
for (i = k = 0, len1 = ref.length; k < len1; i = ++k) {
key = ref[i];
if ((node = nodes[(Math.floor(i / 4)) * this.width + (i % 4)])) {
if (i % 4 < this.width && (node = nodes[nodes.length - (4 - Math.floor(i / 4)) * this.width + (i % 4)])) {
node.title = "" + (key[0].toUpperCase()) + key.slice(1);
}
}
@ -8141,7 +8141,7 @@
} else if (n === 9 && (i = this.imageKeys.indexOf(key)) >= 0) {
this.images[i % 9].click();
verify.focus();
} else if (n !== 9 && (i = this.imageKeys16.indexOf(key)) >= 0 && (img = this.images[(Math.floor(i / 4)) * w + (i % 4)])) {
} else if (n !== 9 && (i = this.imageKeys16.indexOf(key)) >= 0 && i % 4 < w && (img = this.images[n - (4 - Math.floor(i / 4)) * w + (i % 4)])) {
img.click();
verify.focus();
} else if (dx = {

BIN
builds/4chan-X.zip
View File

Binary file not shown.

2
builds/updates-beta.xml
View File

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

2
builds/updates.xml
View File

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

4
src/Posting/Captcha.fixes.coffee
View File

@ -119,7 +119,7 @@ Captcha.fixes =
addTooltips16: (nodes) ->
for key, i in @imageKeys16
if (node = nodes[(i // 4)*@width + (i % 4)])
if i % 4 < @width and (node = nodes[nodes.length - (4 - i//4)*@width + (i % 4)])
node.title = "#{key[0].toUpperCase()}#{key[1..]}"
return
@ -146,7 +146,7 @@ Captcha.fixes =
else if n is 9 and (i = @imageKeys.indexOf key) >= 0
@images[i % 9].click()
verify.focus()
else if n isnt 9 and (i = @imageKeys16.indexOf key) >= 0 and (img = @images[(i // 4)*w + (i % 4)])
else if n isnt 9 and (i = @imageKeys16.indexOf key) >= 0 and i % 4 < w and (img = @images[n - (4 - i//4)*w + (i % 4)])
img.click()
verify.focus()
else if dx = {'Up': n, 'Down': w, 'Left': last, 'Right': 1}[key]

4
version.json
View File

@ -1,4 +1,4 @@
{
"version": "1.11.25.0",
"date": "2016-02-11T09:16:54.091Z"
"version": "1.11.25.1",
"date": "2016-02-13T01:25:08.650Z"
}