diff --git a/CHANGELOG.md b/CHANGELOG.md index c32a0b530..042a45f50 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor ### v1.11.15 +**v1.11.15.7** *(2015-11-07)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.15.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.15.7/builds/4chan-X-noupdate.crx "Chromium version")] +- Fix cleaning of post history on /trash/ and remove links to nonexistent internal archive. + **v1.11.15.6** *(2015-11-07)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.15.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.15.6/builds/4chan-X-noupdate.crx "Chromium version")] - (desustorage, bui) Update archive list: Add /trash/. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 6c74d55df..41befb035 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 37067e476..b85a1e7c3 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.11.15.6 +// @version 1.11.15.7 // @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 070907359..2c39d2ccb 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.11.15.6 +// @version 1.11.15.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -415,7 +415,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.15.6', + VERSION: '1.11.15.7', NAMESPACE: '4chan X.', boards: {} }; @@ -1892,7 +1892,7 @@ return $.cache("//a.4cdn.org/" + boardID + "/threads.json", (function(_this) { return function(e1) { if (e1.target.status === 200) { - if (boardID === 'b' || boardID === 'f') { + if (boardID === 'b' || boardID === 'f' || boardID === 'trash') { return _this.ajaxCleanParse(boardID, e1.target.response); } else { return $.cache("//a.4cdn.org/" + boardID + "/archive.json", function(e2) { @@ -2864,7 +2864,7 @@ } } if (/-expired/.test(t)) { - if (boardID !== 'b' && boardID !== 'f') { + if (boardID !== 'b' && boardID !== 'f' && boardID !== 'trash') { a.href = "/" + boardID + "/archive"; } else { return a.firstChild; @@ -3160,7 +3160,7 @@ Index = { showHiddenThreads: false, init: function() { - var anchorEntry, input, k, label, len1, len2, name, pinEntry, q, ref, ref1, ref2, ref3, ref4, ref5, refNavEntry, repliesEntry, select; + var anchorEntry, input, k, label, len1, len2, name, pinEntry, q, ref, ref1, ref2, ref3, ref4, ref5, ref6, refNavEntry, repliesEntry, select; if (g.BOARD.ID === 'f' || !Conf['JSON Navigation'] || g.VIEW !== 'index') { return; } @@ -3244,7 +3244,7 @@ innerHTML: "Index Catalog Archive Bottom ×" }); $('.cataloglink a', this.navLinks).href = CatalogLinks.catalog(); - if (g.BOARD.ID === 'b') { + if ((ref5 = g.BOARD.ID) === 'b' || ref5 === 'trash') { $('.archlistlink', this.navLinks).hidden = true; } this.searchInput = $('#index-search', this.navLinks); @@ -3261,9 +3261,9 @@ $.on($('#index-search-clear', this.navLinks), 'click', this.clearSearch); $.on($('#hidden-toggle a', this.navLinks), 'click', this.cb.toggleHiddenThreads); $.on(this.selectMode, 'change', this.cb.mode); - ref5 = [this.selectMode, this.selectSort, this.selectSize]; - for (q = 0, len2 = ref5.length; q < len2; q++) { - select = ref5[q]; + ref6 = [this.selectMode, this.selectSort, this.selectSize]; + for (q = 0, len2 = ref6.length; q < len2; q++) { + select = ref6[q]; select.value = Conf[select.name]; $.on(select, 'change', $.cb.value); } @@ -3278,16 +3278,16 @@ $.asap((function() { return $('.board > .thread > .postContainer', doc) || d.readyState !== 'loading'; }), function() { - var board, el, len3, len4, ref6, ref7, threadRoot, topNavPos, u, v; + var board, el, len3, len4, ref7, ref8, threadRoot, topNavPos, u, v; if (!Main.isThisPageLegit()) { return; } Index.hat = $('.board > .thread > img:first-child'); if (Index.hat) { if (Index.nodes) { - ref6 = Index.nodes; - for (u = 0, len3 = ref6.length; u < len3; u++) { - threadRoot = ref6[u]; + ref7 = Index.nodes; + for (u = 0, len3 = ref7.length; u < len3; u++) { + threadRoot = ref7[u]; $.prepend(threadRoot, Index.hat.cloneNode(false)); } } @@ -3298,9 +3298,9 @@ $.replace(board, Index.root); $.event('PostsInserted'); d.implementation.createDocument(null, null, null).appendChild(board); - ref7 = $$('.navLinks'); - for (v = 0, len4 = ref7.length; v < len4; v++) { - el = ref7[v]; + ref8 = $$('.navLinks'); + for (v = 0, len4 = ref8.length; v < len4; v++) { + el = ref8[v]; $.rm(el); } $.rm($.id('ctrl-top')); @@ -17307,7 +17307,7 @@ if (g.VIEW === 'catalog' && g.BOARD.ID === 'f') { return; } - if (g.VIEW === 'archive' && ((ref1 = g.BOARD.ID) === 'b' || ref1 === 'f')) { + if (g.VIEW === 'archive' && ((ref1 = g.BOARD.ID) === 'b' || ref1 === 'f' || ref1 === 'trash')) { return; } if (g.VIEW === 'thread') { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 9df041582..18422d5a3 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 726564214..527c56900 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.11.15.6 +// @version 1.11.15.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -415,7 +415,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.15.6', + VERSION: '1.11.15.7', NAMESPACE: '4chan X.', boards: {} }; @@ -1892,7 +1892,7 @@ return $.cache("//a.4cdn.org/" + boardID + "/threads.json", (function(_this) { return function(e1) { if (e1.target.status === 200) { - if (boardID === 'b' || boardID === 'f') { + if (boardID === 'b' || boardID === 'f' || boardID === 'trash') { return _this.ajaxCleanParse(boardID, e1.target.response); } else { return $.cache("//a.4cdn.org/" + boardID + "/archive.json", function(e2) { @@ -2864,7 +2864,7 @@ } } if (/-expired/.test(t)) { - if (boardID !== 'b' && boardID !== 'f') { + if (boardID !== 'b' && boardID !== 'f' && boardID !== 'trash') { a.href = "/" + boardID + "/archive"; } else { return a.firstChild; @@ -3160,7 +3160,7 @@ Index = { showHiddenThreads: false, init: function() { - var anchorEntry, input, k, label, len1, len2, name, pinEntry, q, ref, ref1, ref2, ref3, ref4, ref5, refNavEntry, repliesEntry, select; + var anchorEntry, input, k, label, len1, len2, name, pinEntry, q, ref, ref1, ref2, ref3, ref4, ref5, ref6, refNavEntry, repliesEntry, select; if (g.BOARD.ID === 'f' || !Conf['JSON Navigation'] || g.VIEW !== 'index') { return; } @@ -3244,7 +3244,7 @@ innerHTML: "Index Catalog Archive Bottom ×" }); $('.cataloglink a', this.navLinks).href = CatalogLinks.catalog(); - if (g.BOARD.ID === 'b') { + if ((ref5 = g.BOARD.ID) === 'b' || ref5 === 'trash') { $('.archlistlink', this.navLinks).hidden = true; } this.searchInput = $('#index-search', this.navLinks); @@ -3261,9 +3261,9 @@ $.on($('#index-search-clear', this.navLinks), 'click', this.clearSearch); $.on($('#hidden-toggle a', this.navLinks), 'click', this.cb.toggleHiddenThreads); $.on(this.selectMode, 'change', this.cb.mode); - ref5 = [this.selectMode, this.selectSort, this.selectSize]; - for (q = 0, len2 = ref5.length; q < len2; q++) { - select = ref5[q]; + ref6 = [this.selectMode, this.selectSort, this.selectSize]; + for (q = 0, len2 = ref6.length; q < len2; q++) { + select = ref6[q]; select.value = Conf[select.name]; $.on(select, 'change', $.cb.value); } @@ -3278,16 +3278,16 @@ $.asap((function() { return $('.board > .thread > .postContainer', doc) || d.readyState !== 'loading'; }), function() { - var board, el, len3, len4, ref6, ref7, threadRoot, topNavPos, u, v; + var board, el, len3, len4, ref7, ref8, threadRoot, topNavPos, u, v; if (!Main.isThisPageLegit()) { return; } Index.hat = $('.board > .thread > img:first-child'); if (Index.hat) { if (Index.nodes) { - ref6 = Index.nodes; - for (u = 0, len3 = ref6.length; u < len3; u++) { - threadRoot = ref6[u]; + ref7 = Index.nodes; + for (u = 0, len3 = ref7.length; u < len3; u++) { + threadRoot = ref7[u]; $.prepend(threadRoot, Index.hat.cloneNode(false)); } } @@ -3298,9 +3298,9 @@ $.replace(board, Index.root); $.event('PostsInserted'); d.implementation.createDocument(null, null, null).appendChild(board); - ref7 = $$('.navLinks'); - for (v = 0, len4 = ref7.length; v < len4; v++) { - el = ref7[v]; + ref8 = $$('.navLinks'); + for (v = 0, len4 = ref8.length; v < len4; v++) { + el = ref8[v]; $.rm(el); } $.rm($.id('ctrl-top')); @@ -17307,7 +17307,7 @@ if (g.VIEW === 'catalog' && g.BOARD.ID === 'f') { return; } - if (g.VIEW === 'archive' && ((ref1 = g.BOARD.ID) === 'b' || ref1 === 'f')) { + if (g.VIEW === 'archive' && ((ref1 = g.BOARD.ID) === 'b' || ref1 === 'f' || ref1 === 'trash')) { return; } if (g.VIEW === 'thread') { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index ac958ffc4..70e0bf40a 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 3fa9ba954..33f8e6abf 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.11.15.6 +// @version 1.11.15.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 6a233b902..ffb0c5db7 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.11.15.6 +// @version 1.11.15.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -415,7 +415,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.15.6', + VERSION: '1.11.15.7', NAMESPACE: '4chan X.', boards: {} }; @@ -1892,7 +1892,7 @@ return $.cache("//a.4cdn.org/" + boardID + "/threads.json", (function(_this) { return function(e1) { if (e1.target.status === 200) { - if (boardID === 'b' || boardID === 'f') { + if (boardID === 'b' || boardID === 'f' || boardID === 'trash') { return _this.ajaxCleanParse(boardID, e1.target.response); } else { return $.cache("//a.4cdn.org/" + boardID + "/archive.json", function(e2) { @@ -2864,7 +2864,7 @@ } } if (/-expired/.test(t)) { - if (boardID !== 'b' && boardID !== 'f') { + if (boardID !== 'b' && boardID !== 'f' && boardID !== 'trash') { a.href = "/" + boardID + "/archive"; } else { return a.firstChild; @@ -3160,7 +3160,7 @@ Index = { showHiddenThreads: false, init: function() { - var anchorEntry, input, k, label, len1, len2, name, pinEntry, q, ref, ref1, ref2, ref3, ref4, ref5, refNavEntry, repliesEntry, select; + var anchorEntry, input, k, label, len1, len2, name, pinEntry, q, ref, ref1, ref2, ref3, ref4, ref5, ref6, refNavEntry, repliesEntry, select; if (g.BOARD.ID === 'f' || !Conf['JSON Navigation'] || g.VIEW !== 'index') { return; } @@ -3244,7 +3244,7 @@ innerHTML: "Index Catalog Archive Bottom ×" }); $('.cataloglink a', this.navLinks).href = CatalogLinks.catalog(); - if (g.BOARD.ID === 'b') { + if ((ref5 = g.BOARD.ID) === 'b' || ref5 === 'trash') { $('.archlistlink', this.navLinks).hidden = true; } this.searchInput = $('#index-search', this.navLinks); @@ -3261,9 +3261,9 @@ $.on($('#index-search-clear', this.navLinks), 'click', this.clearSearch); $.on($('#hidden-toggle a', this.navLinks), 'click', this.cb.toggleHiddenThreads); $.on(this.selectMode, 'change', this.cb.mode); - ref5 = [this.selectMode, this.selectSort, this.selectSize]; - for (q = 0, len2 = ref5.length; q < len2; q++) { - select = ref5[q]; + ref6 = [this.selectMode, this.selectSort, this.selectSize]; + for (q = 0, len2 = ref6.length; q < len2; q++) { + select = ref6[q]; select.value = Conf[select.name]; $.on(select, 'change', $.cb.value); } @@ -3278,16 +3278,16 @@ $.asap((function() { return $('.board > .thread > .postContainer', doc) || d.readyState !== 'loading'; }), function() { - var board, el, len3, len4, ref6, ref7, threadRoot, topNavPos, u, v; + var board, el, len3, len4, ref7, ref8, threadRoot, topNavPos, u, v; if (!Main.isThisPageLegit()) { return; } Index.hat = $('.board > .thread > img:first-child'); if (Index.hat) { if (Index.nodes) { - ref6 = Index.nodes; - for (u = 0, len3 = ref6.length; u < len3; u++) { - threadRoot = ref6[u]; + ref7 = Index.nodes; + for (u = 0, len3 = ref7.length; u < len3; u++) { + threadRoot = ref7[u]; $.prepend(threadRoot, Index.hat.cloneNode(false)); } } @@ -3298,9 +3298,9 @@ $.replace(board, Index.root); $.event('PostsInserted'); d.implementation.createDocument(null, null, null).appendChild(board); - ref7 = $$('.navLinks'); - for (v = 0, len4 = ref7.length; v < len4; v++) { - el = ref7[v]; + ref8 = $$('.navLinks'); + for (v = 0, len4 = ref8.length; v < len4; v++) { + el = ref8[v]; $.rm(el); } $.rm($.id('ctrl-top')); @@ -17307,7 +17307,7 @@ if (g.VIEW === 'catalog' && g.BOARD.ID === 'f') { return; } - if (g.VIEW === 'archive' && ((ref1 = g.BOARD.ID) === 'b' || ref1 === 'f')) { + if (g.VIEW === 'archive' && ((ref1 = g.BOARD.ID) === 'b' || ref1 === 'f' || ref1 === 'trash')) { return; } if (g.VIEW === 'thread') { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 076736c71..9c0d930eb 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 25040a2e9..d7fd60131 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 c7b4b11f7..acb64d61a 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index 1bd836d75..6d1c4247a 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.11.15.6", - "date": "2015-11-07T16:34:48.852Z" + "version": "1.11.15.7", + "date": "2015-11-07T21:55:38.769Z" }