Merge branch 'master' of git://github.com/MayhemYDG/4chan-x

This commit is contained in:
ahodesuka 2012-05-07 00:20:58 -05:00
commit cc72a0fdfa
5 changed files with 654 additions and 278 deletions

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
{exec} = require 'child_process' {exec} = require 'child_process'
fs = require 'fs' fs = require 'fs'
VERSION = '2.29.3' VERSION = '2.29.4'
HEADER = """ HEADER = """
// ==UserScript== // ==UserScript==

View File

@ -1,6 +1,9 @@
master master
2.29.4
- Mayhem - Mayhem
Auto-GIF will not run in /gif/. Auto-GIF will not run in /gif/.
Fix QR filetype checking.
2.29.3 2.29.3
- Mayhem - Mayhem

View File

@ -1 +1 @@
postMessage({version:'2.29.3'},'*') postMessage({version:'2.29.4'},'*')

View File

@ -1407,7 +1407,7 @@ QR =
ta.style.cssText = $.get 'QR.size', '' ta.style.cssText = $.get 'QR.size', ''
# Allow only this board's supported files. # Allow only this board's supported files.
mimeTypes = $('.rules').firstChild.textContent.match(/: (.+) /)[1].toLowerCase().replace /\w+/g, (type) -> mimeTypes = $('.rules').firstElementChild.textContent.match(/: (.+)/)[1].toLowerCase().replace /\w+/g, (type) ->
switch type switch type
when 'jpg' when 'jpg'
'image/jpeg' 'image/jpeg'
@ -3270,7 +3270,7 @@ Main =
Main.node [Main.preParse target] if target.nodeName is 'TABLE' Main.node [Main.preParse target] if target.nodeName is 'TABLE'
namespace: '4chan_x.' namespace: '4chan_x.'
version: '2.29.3' version: '2.29.4'
callbacks: [] callbacks: []
css: ' css: '
/* dialog styling */ /* dialog styling */