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

Merge branch 'bstable' into bbeta

Browse Source 
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:
ccd0 2015-01-27 10:52:15 -08:00
commit afa6ec9dd4
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -21,6 +21,11 @@ Based on v1.9.20.8.
- Minor bugfixes. - Minor bugfixes.
<!-- v1.9.20.x --> <!-- v1.9.20.x -->
### v1.9.20.10
*2015-01-27* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.20.10/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.20.10/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix reloading of noscript captcha images that failed to load the first time.
### v1.9.20.9 ### v1.9.20.9
*2015-01-26* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.20.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.20.9/builds/4chan-X-noupdate.crx "Chromium version")] *2015-01-26* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.20.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.20.9/builds/4chan-X-noupdate.crx "Chromium version")]

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

@ -90,7 +90,7 @@ Captcha.noscript =
src: @iframeURL src: @iframeURL
$.add d.body, @nodes.iframe $.add d.body, @nodes.iframe
@conn.target = @nodes.iframe.contentWindow @conn.target = @nodes.iframe.contentWindow
else if !@occupied else if !@occupied or force
@nodes.iframe.src = @iframeURL @nodes.iframe.src = @iframeURL
@occupied = true @occupied = true
@nodes.input.focus() if focus @nodes.input.focus() if focus