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

Merge branch 'bstable'

Browse Source
This commit is contained in:
ccd0 2015-11-20 18:49:19 -08:00
commit 46a800ce62
16 changed files with 38 additions and 38 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.17
**v1.11.17.8** *(2015-11-20)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.8/builds/4chan-X-noupdate.crx "Chromium version")]
- A few more captcha focusing tweaks.
**v1.11.17.7** *(2015-11-20)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.7/builds/4chan-X-noupdate.crx "Chromium version")]
- More captcha tweaks / fixes.

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.17.7
// @version 1.11.17.8
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X

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

@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X beta
// @version 1.11.17.7
// @version 1.11.17.8
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -433,7 +433,7 @@
doc = d.documentElement;
g = {
VERSION: '1.11.17.7',
VERSION: '1.11.17.8',
NAMESPACE: '4chan X.',
boards: {}
};
@ -7714,7 +7714,7 @@
captcha = QR.captcha.getOne();
if (!captcha) {
err = 'No valid captcha.';
QR.captcha.setup(true);
QR.captcha.setup(!QR.cooldown.auto || d.activeElement === QR.nodes.status);
}
}
QR.cleanNotifications();
@ -7851,7 +7851,7 @@
} else {
QR.cooldown.auto = false;
}
QR.captcha.setup(QR.cooldown.auto);
QR.captcha.setup(QR.cooldown.auto && d.activeElement === QR.nodes.status);
if (QR.captcha.isEnabled && !QR.captcha.captchas.length) {
QR.cooldown.auto = false;
}
@ -8298,12 +8298,11 @@
onNewPost: function() {},
onPostChange: function() {},
setup: function(focus, force) {
var ref;
if (!(this.isEnabled && (force || this.needed()))) {
return;
}
this.create();
if (focus && ((ref = d.activeElement) === QR.nodes.status || ref === d.body)) {
if (focus) {
return this.nodes.input.focus();
}
},
@ -8592,11 +8591,11 @@
}
},
setup: function(focus, force) {
var iframe, ref;
var iframe;
if (!(this.isEnabled && (this.needed() || force))) {
return;
}
if (focus && ((ref = d.activeElement) === QR.nodes.status || ref === d.body)) {
if (focus) {
this.nodes.counter.focus();
}
if (this.timeouts.destroy) {
@ -8773,7 +8772,7 @@
this.captchas = this.captchas.slice(i);
this.count();
$.set('captchas', this.captchas);
return this.setup(true);
return this.setup(d.activeElement === QR.nodes.status);
},
count: function() {
this.nodes.counter.textContent = "Captchas: " + this.captchas.length;

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

Binary file not shown.

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

@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
// @version 1.11.17.7
// @version 1.11.17.8
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -433,7 +433,7 @@
doc = d.documentElement;
g = {
VERSION: '1.11.17.7',
VERSION: '1.11.17.8',
NAMESPACE: '4chan X.',
boards: {}
};
@ -7714,7 +7714,7 @@
captcha = QR.captcha.getOne();
if (!captcha) {
err = 'No valid captcha.';
QR.captcha.setup(true);
QR.captcha.setup(!QR.cooldown.auto || d.activeElement === QR.nodes.status);
}
}
QR.cleanNotifications();
@ -7851,7 +7851,7 @@
} else {
QR.cooldown.auto = false;
}
QR.captcha.setup(QR.cooldown.auto);
QR.captcha.setup(QR.cooldown.auto && d.activeElement === QR.nodes.status);
if (QR.captcha.isEnabled && !QR.captcha.captchas.length) {
QR.cooldown.auto = false;
}
@ -8298,12 +8298,11 @@
onNewPost: function() {},
onPostChange: function() {},
setup: function(focus, force) {
var ref;
if (!(this.isEnabled && (force || this.needed()))) {
return;
}
this.create();
if (focus && ((ref = d.activeElement) === QR.nodes.status || ref === d.body)) {
if (focus) {
return this.nodes.input.focus();
}
},
@ -8592,11 +8591,11 @@
}
},
setup: function(focus, force) {
var iframe, ref;
var iframe;
if (!(this.isEnabled && (this.needed() || force))) {
return;
}
if (focus && ((ref = d.activeElement) === QR.nodes.status || ref === d.body)) {
if (focus) {
this.nodes.counter.focus();
}
if (this.timeouts.destroy) {
@ -8773,7 +8772,7 @@
this.captchas = this.captchas.slice(i);
this.count();
$.set('captchas', this.captchas);
return this.setup(true);
return this.setup(d.activeElement === QR.nodes.status);
},
count: function() {
this.nodes.counter.textContent = "Captchas: " + this.captchas.length;

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.17.7
// @version 1.11.17.8
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X

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

@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
// @version 1.11.17.7
// @version 1.11.17.8
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -433,7 +433,7 @@
doc = d.documentElement;
g = {
VERSION: '1.11.17.7',
VERSION: '1.11.17.8',
NAMESPACE: '4chan X.',
boards: {}
};
@ -7714,7 +7714,7 @@
captcha = QR.captcha.getOne();
if (!captcha) {
err = 'No valid captcha.';
QR.captcha.setup(true);
QR.captcha.setup(!QR.cooldown.auto || d.activeElement === QR.nodes.status);
}
}
QR.cleanNotifications();
@ -7851,7 +7851,7 @@
} else {
QR.cooldown.auto = false;
}
QR.captcha.setup(QR.cooldown.auto);
QR.captcha.setup(QR.cooldown.auto && d.activeElement === QR.nodes.status);
if (QR.captcha.isEnabled && !QR.captcha.captchas.length) {
QR.cooldown.auto = false;
}
@ -8298,12 +8298,11 @@
onNewPost: function() {},
onPostChange: function() {},
setup: function(focus, force) {
var ref;
if (!(this.isEnabled && (force || this.needed()))) {
return;
}
this.create();
if (focus && ((ref = d.activeElement) === QR.nodes.status || ref === d.body)) {
if (focus) {
return this.nodes.input.focus();
}
},
@ -8592,11 +8591,11 @@
}
},
setup: function(focus, force) {
var iframe, ref;
var iframe;
if (!(this.isEnabled && (this.needed() || force))) {
return;
}
if (focus && ((ref = d.activeElement) === QR.nodes.status || ref === d.body)) {
if (focus) {
this.nodes.counter.focus();
}
if (this.timeouts.destroy) {
@ -8773,7 +8772,7 @@
this.captchas = this.captchas.slice(i);
this.count();
$.set('captchas', this.captchas);
return this.setup(true);
return this.setup(d.activeElement === QR.nodes.status);
},
count: function() {
this.nodes.counter.textContent = "Captchas: " + this.captchas.length;

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.17.7' />
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.17.8' />
</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.17.7' />
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.17.8' />
</app>
</gupdate>

2
src/Posting/Captcha.v1.coffee
View File

@ -95,7 +95,7 @@ Captcha.v1 =
setup: (focus, force) ->
return unless @isEnabled and (force or @needed())
@create()
@nodes.input.focus() if focus and d.activeElement in [QR.nodes.status, d.body]
@nodes.input.focus() if focus
afterSetup: ->
return unless challenge = $.id 'recaptcha_challenge_field_holder'

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

@ -66,7 +66,7 @@ Captcha.v2 =
setup: (focus, force) ->
return unless @isEnabled and (@needed() or force)
@nodes.counter.focus() if focus and d.activeElement in [QR.nodes.status, d.body]
@nodes.counter.focus() if focus
if @timeouts.destroy
clearTimeout @timeouts.destroy
delete @timeouts.destroy
@ -209,7 +209,7 @@ Captcha.v2 =
@captchas = @captchas[i..]
@count()
$.set 'captchas', @captchas
@setup true
@setup(d.activeElement is QR.nodes.status)
count: ->
@nodes.counter.textContent = "Captchas: #{@captchas.length}"

4
src/Posting/QR.coffee
View File

@ -632,7 +632,7 @@ QR =
captcha = QR.captcha.getOne()
unless captcha
err = 'No valid captcha.'
QR.captcha.setup true
QR.captcha.setup(!QR.cooldown.auto or d.activeElement is QR.nodes.status)
QR.cleanNotifications()
if err
@ -768,7 +768,7 @@ QR =
QR.cooldown.addDelay post, seconds
else # stop auto-posting
QR.cooldown.auto = false
QR.captcha.setup QR.cooldown.auto
QR.captcha.setup(QR.cooldown.auto and d.activeElement is QR.nodes.status)
QR.cooldown.auto = false if QR.captcha.isEnabled and !QR.captcha.captchas.length
QR.status()
QR.error err

4
version.json
View File

@ -1,4 +1,4 @@
{
"version": "1.11.17.7",
"date": "2015-11-20T20:41:27.482Z"
"version": "1.11.17.8",
"date": "2015-11-21T02:46:47.553Z"
}