diff --git a/CHANGELOG.md b/CHANGELOG.md index 4782a080b..470a65bef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ### v1.14.3 +**v1.14.3.1** *(2018-09-19)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.3.1/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.3.1/builds/4chan-X-noupdate.crx)] +- Fix ad blocking related issues with image downloading. #2066 +- Fix bug with hidden posts count on button in settings. +- Update reporting to archive to work with new report form. This still doesn't work with ad blocking enabled, but you can add `@@||$xmlhttprequest,domain=sys.4chan.org` to your filters to make it work. +- Uncheck 'Report to Archives' checkbox and disable details field by default. #1745 + **v1.14.3.0** *(2018-09-18)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.3.0/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.3.0/builds/4chan-X-noupdate.crx)] - Based on v1.14.2.1. - Fix issues with archives, Link Title, and Github Gist embedding caused by ad blocking changes. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 7a4013159..de585c87d 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 11a8f38d6..ab038a75b 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.3.0 +// @version 1.14.3.1 // @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 86e9d8c33..110984732 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.3.0 +// @version 1.14.3.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -175,7 +175,7 @@ docSet = function() { }; g = { - VERSION: '1.14.3.0', + VERSION: '1.14.3.1', NAMESPACE: '4chan X.', boards: {} }; @@ -11624,17 +11624,40 @@ Settings = (function() { hiddenThreads: {}, hiddenPosts: {} }, function(arg) { - var ID, board, hiddenNum, hiddenPosts, hiddenThreads, ref2, ref3, thread; + var ID, board, hiddenNum, hiddenPosts, hiddenThreads, ref2, ref3, ref4, ref5, site, thread; hiddenThreads = arg.hiddenThreads, hiddenPosts = arg.hiddenPosts; hiddenNum = 0; - ref2 = hiddenThreads.boards; - for (ID in ref2) { - board = ref2[ID]; - hiddenNum += Object.keys(board).length; + for (ID in hiddenThreads) { + site = hiddenThreads[ID]; + if (ID !== 'boards') { + ref2 = site.boards; + for (ID in ref2) { + board = ref2[ID]; + hiddenNum += Object.keys(board).length; + } + } } - ref3 = hiddenPosts.boards; + ref3 = hiddenThreads.boards; for (ID in ref3) { board = ref3[ID]; + hiddenNum += Object.keys(board).length; + } + for (ID in hiddenPosts) { + site = hiddenPosts[ID]; + if (ID !== 'boards') { + ref4 = site.boards; + for (ID in ref4) { + board = ref4[ID]; + for (ID in board) { + thread = board[ID]; + hiddenNum += Object.keys(thread).length; + } + } + } + } + ref5 = hiddenPosts.boards; + for (ID in ref5) { + board = ref5[ID]; for (ID in board) { thread = board[ID]; hiddenNum += Object.keys(thread).length; @@ -11647,7 +11670,7 @@ Settings = (function() { return $.get('hiddenThreads', {}, function(arg) { var boardID, hiddenThreads; hiddenThreads = arg.hiddenThreads; - if ($.hasStorage) { + if ($.hasStorage && Site.software === 'yotsuba') { for (boardID in hiddenThreads.boards) { localStorage.removeItem("4chan-hide-t-" + boardID); } @@ -18358,15 +18381,18 @@ Report = (function() { id: 'archive-report', hidden: true }, { - innerHTML: "" + innerHTML: "" }); enabled = $('#archive-report-enabled', fieldset); reason = $('#archive-report-reason', fieldset); submit = $('#archive-report-submit', fieldset); + $.on(enabled, 'change', function() { + return reason.disabled = !this.checked; + }); if (form && types) { - fieldset.hidden = !$('[value=illegal]', types).checked; + fieldset.hidden = !$('[value="31"]', types).checked; $.on(types, 'change', function(e) { - fieldset.hidden = e.target.value !== 'illegal'; + fieldset.hidden = e.target.value !== '31'; return Report.fit('body'); }); $.after(types, fieldset); @@ -18383,7 +18409,6 @@ Report = (function() { } }); } else if (message) { - enabled.checked = false; fieldset.hidden = /Report submitted!/.test(message.textContent); $.on(enabled, 'change', function() { return submit.hidden = !this.checked; diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 537b51b2f..4dfaf91ab 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 8c4618260..9c1cb31f7 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.3.0 +// @version 1.14.3.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -175,7 +175,7 @@ docSet = function() { }; g = { - VERSION: '1.14.3.0', + VERSION: '1.14.3.1', NAMESPACE: '4chan X.', boards: {} }; @@ -11624,17 +11624,40 @@ Settings = (function() { hiddenThreads: {}, hiddenPosts: {} }, function(arg) { - var ID, board, hiddenNum, hiddenPosts, hiddenThreads, ref2, ref3, thread; + var ID, board, hiddenNum, hiddenPosts, hiddenThreads, ref2, ref3, ref4, ref5, site, thread; hiddenThreads = arg.hiddenThreads, hiddenPosts = arg.hiddenPosts; hiddenNum = 0; - ref2 = hiddenThreads.boards; - for (ID in ref2) { - board = ref2[ID]; - hiddenNum += Object.keys(board).length; + for (ID in hiddenThreads) { + site = hiddenThreads[ID]; + if (ID !== 'boards') { + ref2 = site.boards; + for (ID in ref2) { + board = ref2[ID]; + hiddenNum += Object.keys(board).length; + } + } } - ref3 = hiddenPosts.boards; + ref3 = hiddenThreads.boards; for (ID in ref3) { board = ref3[ID]; + hiddenNum += Object.keys(board).length; + } + for (ID in hiddenPosts) { + site = hiddenPosts[ID]; + if (ID !== 'boards') { + ref4 = site.boards; + for (ID in ref4) { + board = ref4[ID]; + for (ID in board) { + thread = board[ID]; + hiddenNum += Object.keys(thread).length; + } + } + } + } + ref5 = hiddenPosts.boards; + for (ID in ref5) { + board = ref5[ID]; for (ID in board) { thread = board[ID]; hiddenNum += Object.keys(thread).length; @@ -11647,7 +11670,7 @@ Settings = (function() { return $.get('hiddenThreads', {}, function(arg) { var boardID, hiddenThreads; hiddenThreads = arg.hiddenThreads; - if ($.hasStorage) { + if ($.hasStorage && Site.software === 'yotsuba') { for (boardID in hiddenThreads.boards) { localStorage.removeItem("4chan-hide-t-" + boardID); } @@ -18358,15 +18381,18 @@ Report = (function() { id: 'archive-report', hidden: true }, { - innerHTML: "" + innerHTML: "" }); enabled = $('#archive-report-enabled', fieldset); reason = $('#archive-report-reason', fieldset); submit = $('#archive-report-submit', fieldset); + $.on(enabled, 'change', function() { + return reason.disabled = !this.checked; + }); if (form && types) { - fieldset.hidden = !$('[value=illegal]', types).checked; + fieldset.hidden = !$('[value="31"]', types).checked; $.on(types, 'change', function(e) { - fieldset.hidden = e.target.value !== 'illegal'; + fieldset.hidden = e.target.value !== '31'; return Report.fit('body'); }); $.after(types, fieldset); @@ -18383,7 +18409,6 @@ Report = (function() { } }); } else if (message) { - enabled.checked = false; fieldset.hidden = /Report submitted!/.test(message.textContent); $.on(enabled, 'change', function() { return submit.hidden = !this.checked; diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 3cf8f7f0b..47b1a5412 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 0a556a782..533d8e568 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.3.0 +// @version 1.14.3.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index ae648e8e2..2ee9b97d1 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.3.0 +// @version 1.14.3.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -175,7 +175,7 @@ docSet = function() { }; g = { - VERSION: '1.14.3.0', + VERSION: '1.14.3.1', NAMESPACE: '4chan X.', boards: {} }; @@ -11624,17 +11624,40 @@ Settings = (function() { hiddenThreads: {}, hiddenPosts: {} }, function(arg) { - var ID, board, hiddenNum, hiddenPosts, hiddenThreads, ref2, ref3, thread; + var ID, board, hiddenNum, hiddenPosts, hiddenThreads, ref2, ref3, ref4, ref5, site, thread; hiddenThreads = arg.hiddenThreads, hiddenPosts = arg.hiddenPosts; hiddenNum = 0; - ref2 = hiddenThreads.boards; - for (ID in ref2) { - board = ref2[ID]; - hiddenNum += Object.keys(board).length; + for (ID in hiddenThreads) { + site = hiddenThreads[ID]; + if (ID !== 'boards') { + ref2 = site.boards; + for (ID in ref2) { + board = ref2[ID]; + hiddenNum += Object.keys(board).length; + } + } } - ref3 = hiddenPosts.boards; + ref3 = hiddenThreads.boards; for (ID in ref3) { board = ref3[ID]; + hiddenNum += Object.keys(board).length; + } + for (ID in hiddenPosts) { + site = hiddenPosts[ID]; + if (ID !== 'boards') { + ref4 = site.boards; + for (ID in ref4) { + board = ref4[ID]; + for (ID in board) { + thread = board[ID]; + hiddenNum += Object.keys(thread).length; + } + } + } + } + ref5 = hiddenPosts.boards; + for (ID in ref5) { + board = ref5[ID]; for (ID in board) { thread = board[ID]; hiddenNum += Object.keys(thread).length; @@ -11647,7 +11670,7 @@ Settings = (function() { return $.get('hiddenThreads', {}, function(arg) { var boardID, hiddenThreads; hiddenThreads = arg.hiddenThreads; - if ($.hasStorage) { + if ($.hasStorage && Site.software === 'yotsuba') { for (boardID in hiddenThreads.boards) { localStorage.removeItem("4chan-hide-t-" + boardID); } @@ -18358,15 +18381,18 @@ Report = (function() { id: 'archive-report', hidden: true }, { - innerHTML: "" + innerHTML: "" }); enabled = $('#archive-report-enabled', fieldset); reason = $('#archive-report-reason', fieldset); submit = $('#archive-report-submit', fieldset); + $.on(enabled, 'change', function() { + return reason.disabled = !this.checked; + }); if (form && types) { - fieldset.hidden = !$('[value=illegal]', types).checked; + fieldset.hidden = !$('[value="31"]', types).checked; $.on(types, 'change', function(e) { - fieldset.hidden = e.target.value !== 'illegal'; + fieldset.hidden = e.target.value !== '31'; return Report.fit('body'); }); $.after(types, fieldset); @@ -18383,7 +18409,6 @@ Report = (function() { } }); } else if (message) { - enabled.checked = false; fieldset.hidden = /Report submitted!/.test(message.textContent); $.on(enabled, 'change', function() { return submit.hidden = !this.checked; diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index f6bd3b538..f70c07b37 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 4950787b0..567eb3763 100644 --- a/builds/updates-beta.json +++ b/builds/updates-beta.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.3.0", + "version": "1.14.3.1", "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 0f5bc33e4..aaaa29c57 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 34ba27686..cadc970d6 100644 --- a/builds/updates.json +++ b/builds/updates.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.3.0", + "version": "1.14.3.1", "update_link": "https://www.4chan-x.net/builds/4chan-X.crx" } ] diff --git a/builds/updates.xml b/builds/updates.xml index 4ad29f976..2111998a9 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index 267bdda04..0d7fb0d0f 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.14.3.0", - "date": "2018-09-18T11:28:33.974Z" + "version": "1.14.3.1", + "date": "2018-09-19T22:37:16.655Z" } \ No newline at end of file