Merge branch 'bstable'

CHANGELOG.md

@@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
 
 ### v1.11.35
 
+**v1.11.35.6** *(2016-06-18)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.35.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.35.6/builds/4chan-X-noupdate.crx "Chromium version")]
+- Use backslashes instead of concatenation for multiline strings. Fixes issue causing script to stop working for some users in Chrome 53.
+
 **v1.11.35.5** *(2016-06-14)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.35.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.35.5/builds/4chan-X-noupdate.crx "Chromium version")]
 - Fix blocking of MathJax script on /sci/.
 

builds/4chan-X-beta.meta.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.11.35.5
+// @version      1.11.35.6
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X

builds/4chan-X.meta.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.35.5
+// @version      1.11.35.6
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X

builds/updates-beta.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.35.5' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.35.6' />
   </app>
 </gupdate>
 

builds/updates.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.35.5' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.35.6' />
   </app>
 </gupdate>
 

src/config/Config.coffee

@@ -797,7 +797,7 @@ Config =
 
   favicon: 'ferongr'
 
-  usercss: `<%= multiline(read('user.css')) %>`
+  usercss: `<%= JSON.stringify(read('user.css')) %>`
 
   hotkeys:
     # QR & Options

src/meta/jshint.json

@@ -5,6 +5,7 @@
   "expr":    true,
   "sub":     true,
   "scripturl": true,
+  "multistr": true,
   "browser": true,
   "devel":   true,
   "nonstandard": true,

tools/template.js

@@ -21,7 +21,7 @@ tools.readHTML = function(filename) {
 };
 
 tools.multiline = function(text) {
-  return text.replace(/\n+/g, '\n').split(/^/m).map(JSON.stringify).join(' +\n').replace(/`/g, '\\`');
+  return text.replace(/\n+/g, '\n').split(/^/m).map(JSON.stringify).join('+').replace(/"\+"/g, '\\\n');
 };
 
 // Convert JSON object to Coffeescript expression (via embedded JS).

version.json

@@ -1,4 +1,4 @@
 {
-  "version": "1.11.35.5",
-  "date": "2016-06-14T11:41:45.254Z"
+  "version": "1.11.35.6",
+  "date": "2016-06-18T04:29:44.395Z"
 }