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

Merge branch 'bstable'

Browse Source 
Conflicts:
	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-06-03 18:34:18 -07:00
commit 966c6dc441
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -20,6 +20,10 @@ The links to individual versions below are to copies of the script with the upda
### v1.10.12 ### v1.10.12
**v1.10.12.9** *(2015-06-03)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.9/builds/4chan-X-noupdate.crx "Chromium version")]
- Update for captcha changes.
- Work around issue where the captcha causes scrolling to the top of the page.
**v1.10.12.8** *(2015-05-22)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.8/builds/4chan-X-noupdate.crx "Chromium version")] **v1.10.12.8** *(2015-05-22)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.8/builds/4chan-X-noupdate.crx "Chromium version")]
- Remove guard against dropping files into captcha due to continued reports of disabled captchas. - Remove guard against dropping files into captcha due to continued reports of disabled captchas.

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

@ -1,6 +1,6 @@
Captcha.fixes = Captcha.fixes =
css: ''' css: '''
.rc-imageselect-target > .rc-imageselect-tile > img:focus { .rc-imageselect-target > div:focus {
outline: 2px solid #4a90e2; outline: 2px solid #4a90e2;
} }
.rc-button-default:focus { .rc-button-default:focus {
@ -29,7 +29,7 @@ Captcha.fixes =
$.on d, 'keydown', @keybinds.bind(@) $.on d, 'keydown', @keybinds.bind(@)
fixImages: -> fixImages: ->
return unless (@images = $$ '.rc-imageselect-target > .rc-imageselect-tile > img').length return unless (@images = $$ '.rc-imageselect-target > div').length
focus = @images[0].tabIndex isnt 0 focus = @images[0].tabIndex isnt 0
for img in @images for img in @images
img.tabIndex = 0 img.tabIndex = 0

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

@ -60,6 +60,7 @@ Captcha.v2 =
if @nodes.container if @nodes.container
if @shouldFocus and iframe = $ 'iframe', @nodes.container if @shouldFocus and iframe = $ 'iframe', @nodes.container
iframe.focus() iframe.focus()
QR.focus() # Event handler not fired in Firefox
delete @shouldFocus delete @shouldFocus
return return

2
src/Posting/QR.coffee
View File

@ -141,7 +141,7 @@ QR =
$.off d, 'scroll', QR.scrollLock $.off d, 'scroll', QR.scrollLock
inBubble: -> inBubble: ->
$$('.goog-bubble-content > iframe').some((el) -> el.getBoundingClientRect().bottom > 0) d.activeElement in $$('.goog-bubble-content > iframe')
inCaptcha: -> inCaptcha: ->
(d.activeElement?.nodeName is 'IFRAME' and QR.nodes.el.contains(d.activeElement)) or (QR.hasFocus and QR.inBubble()) (d.activeElement?.nodeName is 'IFRAME' and QR.nodes.el.contains(d.activeElement)) or (QR.hasFocus and QR.inBubble())