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

Merge branch 'Stable' into Beta

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 2014-12-10 22:07:56 -08:00
commit 31ae2a687c
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -103,6 +103,14 @@ Based on v1.9.14.2.
- Bug fixes.
<!-- v1.9.14.x -->
### v1.9.14.10
*2014-12-10* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.10/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.10/builds/4chan-X-noupdate.crx "Chromium version")]
**ccd0**
- Possible fix for copy+paste version of captcha not working.
- Disable 4chan's reported post hiding code. (#219)
- Turn `Catalog Links` off by default in stable version also.
### v1.9.14.9
*2014-12-09* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.9/builds/4chan-X-noupdate.crx "Chromium version")]

3
src/Miscellaneous/Fourchan.coffee
View File

@ -36,7 +36,7 @@ Fourchan =
name: 'Parse /sci/ math'
cb: @math
# Disable 4chan's ID highlighting (replaced by IDHighlight).
# Disable 4chan's ID highlighting (replaced by IDHighlight) and reported post hiding.
$.ready ->
$.globalEval '''
(function() {
@ -45,6 +45,7 @@ Fourchan =
for (var i = 0; i < nodes.length; i++) {
nodes[i].removeEventListener("click", idClick, false);
}
window.removeEventListener("message", Report.onMessage, false);
})();
'''

4
src/Posting/QR.captcha.coffee
View File

@ -85,8 +85,8 @@ QR.captcha =
afterSetup: (mutations) ->
for mutation in mutations
for node in mutation.addedNodes
@setupIFrame node if node.nodeName is 'IFRAME'
@setupTextArea node if node.nodeName is 'TEXTAREA'
@setupIFrame iframe if iframe = $.x './descendant-or-self::iframe', node
@setupTextArea textarea if textarea = $.x './descendant-or-self::textarea', node
return
setupIFrame: (iframe) ->