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-25 19:15:39 -08:00
commit ccb30e0fc8
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -23,6 +23,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
### v1.11.17 ### v1.11.17
**v1.11.17.10** *(2015-11-25)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.10/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.10/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix captcha focusing bug.
**v1.11.17.9** *(2015-11-24)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.9/builds/4chan-X-noupdate.crx "Chromium version")] **v1.11.17.9** *(2015-11-24)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.9/builds/4chan-X-noupdate.crx "Chromium version")]
- Support solving 4x4 image captchas with keys in 7-0-/-M square. - Support solving 4x4 image captchas with keys in 7-0-/-M square.

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

@ -95,7 +95,9 @@ Captcha.v1 =
setup: (focus, force) -> setup: (focus, force) ->
return unless @isEnabled and (force or @needed()) return unless @isEnabled and (force or @needed())
@create() @create()
@nodes.input.focus() if focus if focus
$.addClass QR.nodes.el, 'focus'
@nodes.input.focus()
afterSetup: -> afterSetup: ->
return unless challenge = $.id 'recaptcha_challenge_field_holder' return unless challenge = $.id 'recaptcha_challenge_field_holder'

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

@ -66,7 +66,11 @@ Captcha.v2 =
setup: (focus, force) -> setup: (focus, force) ->
return unless @isEnabled and (@needed() or force) return unless @isEnabled and (@needed() or force)
@nodes.counter.focus() if focus
if focus
$.addClass QR.nodes.el, 'focus'
@nodes.counter.focus()
if @timeouts.destroy if @timeouts.destroy
clearTimeout @timeouts.destroy clearTimeout @timeouts.destroy
delete @timeouts.destroy delete @timeouts.destroy

2
src/Posting/QR.coffee
View File

@ -765,7 +765,7 @@ QR =
QR.cooldown.addDelay post, seconds QR.cooldown.addDelay post, seconds
else # stop auto-posting else # stop auto-posting
QR.cooldown.auto = false QR.cooldown.auto = false
QR.captcha.setup(QR.cooldown.auto and d.activeElement is QR.nodes.status) QR.captcha.setup(QR.cooldown.auto and d.activeElement in [QR.nodes.status, d.body])
QR.cooldown.auto = false if QR.captcha.isEnabled and !QR.captcha.captchas.length QR.cooldown.auto = false if QR.captcha.isEnabled and !QR.captcha.captchas.length
QR.status() QR.status()
QR.error err QR.error err