Merge branch 'master' into html

Conflicts:
	4chan_x.user.js
	script.coffee

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 <james.r.campos@gmail.com>
@@ -19,7 +19,7 @@
  * Copyright (c) 2009-2011 James Campos <james.r.campos@gmail.com>
  * Copyright (c) 2012 Nicolas Stepien <stepien.nicolas@gmail.com>
  * 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
@@ -1900,7 +1900,7 @@
         });
         ta.style.cssText = $.get('QR.size', '');
       }
-      mimeTypes = $('ul.rules').firstElementChild.textContent.match(/: (.+)/)[1].toLowerCase().replace(/\w+/g, function(type) {
+      mimeTypes = $('ul.rules').firstElementChild.textContent.trim().match(/: (.+)/)[1].toLowerCase().replace(/\w+/g, function(type) {
         switch (type) {
           case 'jpg':
             return 'image/jpeg';
@@ -4201,7 +4201,7 @@
       }
     },
     namespace: '4chan_x.',
-    version: '2.29.4',
+    version: '2.29.5',
     callbacks: [],
     css: '\
 /* dialog styling */\

Cakefile

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

changelog

@@ -2,6 +2,10 @@ master
 - Mayhem
   Add Spoiler indicator option in File Info Formatting
 
+2.29.5
+- Mayhem
+  Fix QR filetype checking on /w/.
+
 2.29.4
 - Mayhem
   Auto-GIF will not run in /gif/.

latest.js

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

script.coffee

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