Merge branch 'Stable' into Beta
Conflicts: LICENSE builds/4chan-X-beta.crx builds/4chan-X-beta.meta.js builds/4chan-X-beta.user.js builds/4chan-X-noupdate.crx builds/4chan-X-noupdate.user.js builds/4chan-X.crx builds/4chan-X.meta.js builds/4chan-X.user.js builds/4chan-X.zip builds/updates-beta.xml builds/updates.xml package.json
This commit is contained in:
commit
610de06238
@ -121,6 +121,12 @@ Based on v1.9.14.2.
|
|||||||
- Bug fixes.
|
- Bug fixes.
|
||||||
|
|
||||||
<!-- v1.9.14.x -->
|
<!-- v1.9.14.x -->
|
||||||
|
### v1.9.14.12
|
||||||
|
*2014-12-11* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.12/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.12/builds/4chan-X-noupdate.crx "Chromium version")]
|
||||||
|
|
||||||
|
**ccd0**
|
||||||
|
- Fix more captcha setup bugs.
|
||||||
|
|
||||||
### v1.9.14.11
|
### v1.9.14.11
|
||||||
*2014-12-11* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.11/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.11/builds/4chan-X-noupdate.crx "Chromium version")]
|
*2014-12-11* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.11/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.11/builds/4chan-X-noupdate.crx "Chromium version")]
|
||||||
|
|
||||||
|
|||||||
@ -34,6 +34,7 @@ QR.captcha =
|
|||||||
|
|
||||||
onPostChange: ->
|
onPostChange: ->
|
||||||
@setup() if @postsCount is 0
|
@setup() if @postsCount is 0
|
||||||
|
@postsCount = 0 if QR.posts.length is 1 and !Conf['Auto-load captcha'] and !QR.posts[0].com and !QR.posts[0].file
|
||||||
|
|
||||||
toggle: ->
|
toggle: ->
|
||||||
if @nodes.container and !@timeouts.destroy
|
if @nodes.container and !@timeouts.destroy
|
||||||
|
|||||||
@ -121,6 +121,7 @@ QR =
|
|||||||
QR.status()
|
QR.status()
|
||||||
QR.captcha.destroy()
|
QR.captcha.destroy()
|
||||||
focusin: ->
|
focusin: ->
|
||||||
|
QR.captcha.setup() if $.hasClass(QR.nodes.el, 'autohide') and !$.hasClass(QR.nodes.el, 'focus')
|
||||||
$.addClass QR.nodes.el, 'focus'
|
$.addClass QR.nodes.el, 'focus'
|
||||||
focusout: ->
|
focusout: ->
|
||||||
$.rmClass QR.nodes.el, 'focus'
|
$.rmClass QR.nodes.el, 'focus'
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user