From 3f3a3c5b9e3f67391ce5dffb2cd8e6bdd2eb72a7 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Mon, 7 May 2012 09:48:55 +0200 Subject: [PATCH 1/2] Fix #410. --- 4chan_x.user.js | 2 +- script.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 06183f69c..d5f04a199 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1841,7 +1841,7 @@ }); ta.style.cssText = $.get('QR.size', ''); } - mimeTypes = $('.rules').firstElementChild.textContent.match(/: (.+)/)[1].toLowerCase().replace(/\w+/g, function(type) { + mimeTypes = $('.rules').firstElementChild.textContent.trim().match(/: (.+)/)[1].toLowerCase().replace(/\w+/g, function(type) { switch (type) { case 'jpg': return 'image/jpeg'; diff --git a/script.coffee b/script.coffee index 022c8f4ef..8be25ce58 100644 --- a/script.coffee +++ b/script.coffee @@ -1405,7 +1405,7 @@ QR = ta.style.cssText = $.get 'QR.size', '' # Allow only this board's supported files. - mimeTypes = $('.rules').firstElementChild.textContent.match(/: (.+)/)[1].toLowerCase().replace /\w+/g, (type) -> + mimeTypes = $('.rules').firstElementChild.textContent.trim().match(/: (.+)/)[1].toLowerCase().replace /\w+/g, (type) -> switch type when 'jpg' 'image/jpeg' From dba8576225031d1b3f53cc19acaec188f006e781 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Mon, 7 May 2012 09:51:38 +0200 Subject: [PATCH 2/2] Release 2.29.5. --- 4chan_x.user.js | 6 +++--- Cakefile | 2 +- changelog | 4 ++++ latest.js | 2 +- script.coffee | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index d5f04a199..2c39b5d85 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan x -// @version 2.29.4 +// @version 2.29.5 // @namespace aeosynth // @description Adds various features. // @copyright 2009-2011 James Campos @@ -19,7 +19,7 @@ * Copyright (c) 2009-2011 James Campos * Copyright (c) 2012 Nicolas Stepien * http://mayhemydg.github.com/4chan-x/ - * 4chan X 2.29.4 + * 4chan X 2.29.5 * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -4251,7 +4251,7 @@ } }, namespace: '4chan_x.', - version: '2.29.4', + version: '2.29.5', callbacks: [], css: '\ /* dialog styling */\ diff --git a/Cakefile b/Cakefile index 42e212fe7..8e46204e8 100644 --- a/Cakefile +++ b/Cakefile @@ -2,7 +2,7 @@ {exec} = require 'child_process' fs = require 'fs' -VERSION = '2.29.4' +VERSION = '2.29.5' HEADER = """ // ==UserScript== diff --git a/changelog b/changelog index 11067256f..2471b20df 100644 --- a/changelog +++ b/changelog @@ -1,5 +1,9 @@ master +2.29.5 +- Mayhem + Fix QR filetype checking on /w/. + 2.29.4 - Mayhem Auto-GIF will not run in /gif/. diff --git a/latest.js b/latest.js index a287f3eca..c56c3a3b4 100644 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'2.29.4'},'*') \ No newline at end of file +postMessage({version:'2.29.5'},'*') \ No newline at end of file diff --git a/script.coffee b/script.coffee index 8be25ce58..1bc76bb6f 100644 --- a/script.coffee +++ b/script.coffee @@ -3268,7 +3268,7 @@ Main = Main.node [Main.preParse target] if target.nodeName is 'TABLE' namespace: '4chan_x.' - version: '2.29.4' + version: '2.29.5' callbacks: [] css: ' /* dialog styling */