diff --git a/CHANGELOG.md b/CHANGELOG.md index 636b98892..041f97e5d 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ The attributions below are for work that has been incorporated into the script a The links to individual versions below are to copies of the script with the update URL removed. If you want automatic updates, install the script from the links on the [main page](https://github.com/ccd0/4chan-x). +### v1.9.21.6 +*2015-01-31* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.21.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.21.6/builds/4chan-X-noupdate.crx "Chromium version")] + +- Update for changes in WebM filesize limits. + ### v1.9.21.5 *2015-01-30* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.21.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.21.5/builds/4chan-X-noupdate.crx "Chromium version")] diff --git a/LICENSE b/LICENSE index 86d29c4ff..915d98408 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.9.21.5 +* 4chan X - Version 1.9.21.6 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 75ba81559..a3fae1aa2 100644 Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js index b7bc7acd7..1d939e8f3 100644 --- a/builds/4chan-X-beta.meta.js +++ b/builds/4chan-X-beta.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.9.21.5 +// @version 1.9.21.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js index 87cdd6cf5..e7aaeef71 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X beta -// @version 1.9.21.5 +// @version 1.9.21.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.21.5 +* 4chan X - Version 1.9.21.6 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -397,7 +397,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.21.5', + VERSION: '1.9.21.6', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -7200,7 +7200,7 @@ return (g.VIEW === 'thread' ? $.addClass : $.rmClass)(QR.nodes.el, 'reply-to-thread'); }, dialog: function() { - var dialog, event, i, items, match_max, match_min, name, node, nodes, rules, save, setNode; + var dialog, event, i, items, m, match_max, match_min, name, node, nodes, rules, save, setNode; QR.nodes = nodes = { el: dialog = UI.dialog('qr', 'top: 50px; right: 0px;', { innerHTML: "
×
+
No selected file
" @@ -7241,7 +7241,7 @@ QR.max_width = +(match_max != null ? match_max[1] : void 0) || 10000; QR.max_height = +(match_max != null ? match_max[2] : void 0) || 10000; nodes.fileInput.max = $('input[name=MAX_FILE_SIZE]').value; - QR.max_size_video = 3145728; + QR.max_size_video = (m = Get.scriptData().match(/\bmaxWebmFilesize *= *(\d+)\b/)) ? +m[1] : +nodes.fileInput.max; QR.max_width_video = QR.max_height_video = 2048; QR.max_duration_video = 120; if (Conf['Show New Thread Option in Threads']) { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index e0b82b57a..630661849 100644 Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js index 9b1421ad8..5aed4bae2 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.9.21.5 +// @version 1.9.21.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.21.5 +* 4chan X - Version 1.9.21.6 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -396,7 +396,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.21.5', + VERSION: '1.9.21.6', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -7199,7 +7199,7 @@ return (g.VIEW === 'thread' ? $.addClass : $.rmClass)(QR.nodes.el, 'reply-to-thread'); }, dialog: function() { - var dialog, event, i, items, match_max, match_min, name, node, nodes, rules, save, setNode; + var dialog, event, i, items, m, match_max, match_min, name, node, nodes, rules, save, setNode; QR.nodes = nodes = { el: dialog = UI.dialog('qr', 'top: 50px; right: 0px;', { innerHTML: "
×
+
No selected file
" @@ -7240,7 +7240,7 @@ QR.max_width = +(match_max != null ? match_max[1] : void 0) || 10000; QR.max_height = +(match_max != null ? match_max[2] : void 0) || 10000; nodes.fileInput.max = $('input[name=MAX_FILE_SIZE]').value; - QR.max_size_video = 3145728; + QR.max_size_video = (m = Get.scriptData().match(/\bmaxWebmFilesize *= *(\d+)\b/)) ? +m[1] : +nodes.fileInput.max; QR.max_width_video = QR.max_height_video = 2048; QR.max_duration_video = 120; if (Conf['Show New Thread Option in Threads']) { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index a072b5689..66a128ab2 100644 Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index 53a10006e..e950aae19 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.9.21.5 +// @version 1.9.21.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 186e32738..913d8efd7 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.9.21.5 +// @version 1.9.21.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.21.5 +* 4chan X - Version 1.9.21.6 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -397,7 +397,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.21.5', + VERSION: '1.9.21.6', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -7200,7 +7200,7 @@ return (g.VIEW === 'thread' ? $.addClass : $.rmClass)(QR.nodes.el, 'reply-to-thread'); }, dialog: function() { - var dialog, event, i, items, match_max, match_min, name, node, nodes, rules, save, setNode; + var dialog, event, i, items, m, match_max, match_min, name, node, nodes, rules, save, setNode; QR.nodes = nodes = { el: dialog = UI.dialog('qr', 'top: 50px; right: 0px;', { innerHTML: "
×
+
No selected file
" @@ -7241,7 +7241,7 @@ QR.max_width = +(match_max != null ? match_max[1] : void 0) || 10000; QR.max_height = +(match_max != null ? match_max[2] : void 0) || 10000; nodes.fileInput.max = $('input[name=MAX_FILE_SIZE]').value; - QR.max_size_video = 3145728; + QR.max_size_video = (m = Get.scriptData().match(/\bmaxWebmFilesize *= *(\d+)\b/)) ? +m[1] : +nodes.fileInput.max; QR.max_width_video = QR.max_height_video = 2048; QR.max_duration_video = 120; if (Conf['Show New Thread Option in Threads']) { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index e4e0bb84f..fd67bca6b 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml index edacdb2c8..ac8fd27de 100644 --- a/builds/updates-beta.xml +++ b/builds/updates-beta.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/updates.xml b/builds/updates.xml index 3cdda4552..d1b51600f 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 3a9de3126..1ccc6d9e2 100755 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", - "version": "1.9.21.5", + "version": "1.9.21.6", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",