diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b9aba0a9..bed2bc603 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ ### v1.14.12 +**v1.14.12.3** *(2019-08-09)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.12.3/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.12.3/builds/4chan-X-noupdate.crx)] +- Merge v1.14.11.4: Assume Chrome is broken by default. #2378 + **v1.14.12.2** *(2019-08-09)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.12.2/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.12.2/builds/4chan-X-noupdate.crx)] - Merge v1.14.11.3: Reduce default thread updater interval from 30 seconds to 5 seconds. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 7a91ebbf1..959fd972c 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 d3afa9f14..d684e9d9f 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.14.12.2 +// @version 1.14.12.3 // @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 d9c7bc311..c22bbd80f 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.14.12.2 +// @version 1.14.12.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -199,7 +199,7 @@ docSet = function() { }; g = { - VERSION: '1.14.12.2', + VERSION: '1.14.12.3', NAMESPACE: '4chan X.', sites: Object.create(null), boards: Object.create(null) @@ -270,6 +270,7 @@ Config = (function() { 'Remove Spoilers': [false, 'Remove all spoilers in text.'], 'Reveal Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.'], 'Normalize URL': [true, 'Rewrite the URL of the current page, removing slugs and excess slashes, and changing /res/ to /thread/.'], + 'Work around CORB Bug': [true, 'Leave this checked until your garbage browser is fixed.'], 'Disable Autoplaying Sounds': [false, 'Prevent sounds on the page from autoplaying.'], 'Disable Native Extension': [true, '4chan X is NOT designed to work with the native extension.'], 'Enable Native Flash Embedding': [true, 'Activate the native extension\'s Flash embedding if the native extension is disabled.'] @@ -558,7 +559,6 @@ Config = (function() { 'Thread Quotes': false, 'Max Replies': 1000, 'Autohiding Scrollbar': false, - 'Chromium CORB Bug': false, position: { 'embedding.position': 'top: 50px; right: 0px;', 'thread-stats.position': 'bottom: 0px; right: 0px;', @@ -12730,6 +12730,9 @@ Settings = (function() { if ($.perProtocolSettings || location.protocol !== 'https:') { $('div[data-name="Redirect to HTTPS"]', section).hidden = true; } + if ($.platform !== 'crx') { + $('div[data-name="Work around CORB Bug"]', section).hidden = true; + } $.get(items, function(items) { var val; for (key in items) { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 10decc812..9f9d67deb 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 d726b8518..aaf0bc7e7 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.12.2 +// @version 1.14.12.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -199,7 +199,7 @@ docSet = function() { }; g = { - VERSION: '1.14.12.2', + VERSION: '1.14.12.3', NAMESPACE: '4chan X.', sites: Object.create(null), boards: Object.create(null) @@ -270,6 +270,7 @@ Config = (function() { 'Remove Spoilers': [false, 'Remove all spoilers in text.'], 'Reveal Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.'], 'Normalize URL': [true, 'Rewrite the URL of the current page, removing slugs and excess slashes, and changing /res/ to /thread/.'], + 'Work around CORB Bug': [true, 'Leave this checked until your garbage browser is fixed.'], 'Disable Autoplaying Sounds': [false, 'Prevent sounds on the page from autoplaying.'], 'Disable Native Extension': [true, '4chan X is NOT designed to work with the native extension.'], 'Enable Native Flash Embedding': [true, 'Activate the native extension\'s Flash embedding if the native extension is disabled.'] @@ -558,7 +559,6 @@ Config = (function() { 'Thread Quotes': false, 'Max Replies': 1000, 'Autohiding Scrollbar': false, - 'Chromium CORB Bug': false, position: { 'embedding.position': 'top: 50px; right: 0px;', 'thread-stats.position': 'bottom: 0px; right: 0px;', @@ -12730,6 +12730,9 @@ Settings = (function() { if ($.perProtocolSettings || location.protocol !== 'https:') { $('div[data-name="Redirect to HTTPS"]', section).hidden = true; } + if ($.platform !== 'crx') { + $('div[data-name="Work around CORB Bug"]', section).hidden = true; + } $.get(items, function(items) { var val; for (key in items) { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 15742dba6..f2895bfda 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 9a7bf8e49..4f8fe8fef 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.12.2 +// @version 1.14.12.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index f9f859ad4..095a2d58d 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.12.2 +// @version 1.14.12.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -199,7 +199,7 @@ docSet = function() { }; g = { - VERSION: '1.14.12.2', + VERSION: '1.14.12.3', NAMESPACE: '4chan X.', sites: Object.create(null), boards: Object.create(null) @@ -270,6 +270,7 @@ Config = (function() { 'Remove Spoilers': [false, 'Remove all spoilers in text.'], 'Reveal Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.'], 'Normalize URL': [true, 'Rewrite the URL of the current page, removing slugs and excess slashes, and changing /res/ to /thread/.'], + 'Work around CORB Bug': [true, 'Leave this checked until your garbage browser is fixed.'], 'Disable Autoplaying Sounds': [false, 'Prevent sounds on the page from autoplaying.'], 'Disable Native Extension': [true, '4chan X is NOT designed to work with the native extension.'], 'Enable Native Flash Embedding': [true, 'Activate the native extension\'s Flash embedding if the native extension is disabled.'] @@ -558,7 +559,6 @@ Config = (function() { 'Thread Quotes': false, 'Max Replies': 1000, 'Autohiding Scrollbar': false, - 'Chromium CORB Bug': false, position: { 'embedding.position': 'top: 50px; right: 0px;', 'thread-stats.position': 'bottom: 0px; right: 0px;', @@ -12730,6 +12730,9 @@ Settings = (function() { if ($.perProtocolSettings || location.protocol !== 'https:') { $('div[data-name="Redirect to HTTPS"]', section).hidden = true; } + if ($.platform !== 'crx') { + $('div[data-name="Work around CORB Bug"]', section).hidden = true; + } $.get(items, function(items) { var val; for (key in items) { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 73d9adccb..a9ddb8624 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/updates-beta.json b/builds/updates-beta.json index c62901e9e..4f9cb041b 100644 --- a/builds/updates-beta.json +++ b/builds/updates-beta.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.12.2", + "version": "1.14.12.3", "update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx" } ] diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml index b34cb7430..9aa4b26b7 100644 --- a/builds/updates-beta.xml +++ b/builds/updates-beta.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/updates.json b/builds/updates.json index c8de6edfa..6b09b688d 100644 --- a/builds/updates.json +++ b/builds/updates.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.12.2", + "version": "1.14.12.3", "update_link": "https://www.4chan-x.net/builds/4chan-X.crx" } ] diff --git a/builds/updates.xml b/builds/updates.xml index c9ba27ca8..b2329998a 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index ecfa055a0..07bd6b939 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.14.12.2", - "date": "2019-08-09T02:43:58.143Z" + "version": "1.14.12.3", + "date": "2019-08-09T15:12:38.410Z" } \ No newline at end of file