diff --git a/CHANGELOG.md b/CHANGELOG.md index ca6820f17..531bb4615 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ ## v1.14.0 +**v1.14.0.1** *(2018-01-24)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.1/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.1/builds/4chan-X-noupdate.crx)] +- Fix custom navigation bug from v1.14.0.0 #1774 and older issues #384, #642. + **v1.14.0.0** *(2018-01-24)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.0/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.0/builds/4chan-X-noupdate.crx)] - Based on v1.13.15.5. - Preliminary support for Tinyboard / vichan based imageboards. Only a subset of features are working. To use 4chan X on a site, use the userscript version of 4chan X and add the site the user `@match` rules. In the instructions below, replace "examplechan.com" with the site you want to add: diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index a48660a11..aa8648bcb 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 4ae2beae9..0f0da9ce6 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.0.0 +// @version 1.14.0.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 138f07089..304a7eeb4 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.0.0 +// @version 1.14.0.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -157,7 +157,7 @@ docSet = function() { }; g = { - VERSION: '1.14.0.0', + VERSION: '1.14.0.1', NAMESPACE: '4chan X.', boards: {} }; @@ -8892,6 +8892,10 @@ BoardConfig = (function() { } boards = this.boards || Conf['boardConfig'].boards; return boards && !boards[boardID].webm_audio; + }, + title: function(boardID) { + var ref, ref1; + return ((ref = this.boards || Conf['boardConfig'].boards) != null ? (ref1 = ref[boardID]) != null ? ref1.title : void 0 : void 0) || ''; } }; @@ -9522,14 +9526,13 @@ Header = (function() { return CatalogLinks.setLinks(fullBoardList); }, generateBoardList: function(boardnav) { - var as, list, nodes, re, t; + var list, nodes, re, t; list = $('#custom-board-list', Header.boardList); $.rmAll(list); if (!boardnav) { return; } boardnav = boardnav.replace(/(\r\n|\n|\r)/g, ' '); - as = $$('#full-board-list a[title]', Header.boardList); re = /[\w@]+(-(all|title|replace|full|index|catalog|archive|expired|(mode|sort|text):"[^"]+"(,"[^"]+")?))*|[^\w@]+/g; nodes = (function() { var j, len, ref, results; @@ -9537,14 +9540,14 @@ Header = (function() { results = []; for (j = 0, len = ref.length; j < len; j++) { t = ref[j]; - results.push(Header.mapCustomNavigation(t, as)); + results.push(Header.mapCustomNavigation(t)); } return results; })(); $.add(list, nodes); return CatalogLinks.setLinks(list); }, - mapCustomNavigation: function(t, as) { + mapCustomNavigation: function(t) { var a, boardID, href, indexOptions, m, text, url; if (/^[^\w@]/.test(t)) { return $.tn(t); @@ -9595,7 +9598,7 @@ Header = (function() { } } a = (function() { - var j, len, ref; + var ref; if (boardID === '@') { return $.el('a', { href: 'https://twitter.com/4chan', @@ -9603,15 +9606,10 @@ Header = (function() { textContent: '@' }); } - for (j = 0, len = as.length; j < len; j++) { - a = as[j]; - if (a.textContent === boardID) { - return a.cloneNode(true); - } - } a = $.el('a', { href: "//boards.4chan.org/" + boardID + "/", - textContent: boardID + textContent: boardID, + title: BoardConfig.title(boardID) }); if ((ref = g.VIEW) === 'catalog' || ref === 'archive') { a.href += g.VIEW; diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 6b224277d..c54630ee4 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 4e976183b..7cb12645b 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.0.0 +// @version 1.14.0.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -157,7 +157,7 @@ docSet = function() { }; g = { - VERSION: '1.14.0.0', + VERSION: '1.14.0.1', NAMESPACE: '4chan X.', boards: {} }; @@ -8892,6 +8892,10 @@ BoardConfig = (function() { } boards = this.boards || Conf['boardConfig'].boards; return boards && !boards[boardID].webm_audio; + }, + title: function(boardID) { + var ref, ref1; + return ((ref = this.boards || Conf['boardConfig'].boards) != null ? (ref1 = ref[boardID]) != null ? ref1.title : void 0 : void 0) || ''; } }; @@ -9522,14 +9526,13 @@ Header = (function() { return CatalogLinks.setLinks(fullBoardList); }, generateBoardList: function(boardnav) { - var as, list, nodes, re, t; + var list, nodes, re, t; list = $('#custom-board-list', Header.boardList); $.rmAll(list); if (!boardnav) { return; } boardnav = boardnav.replace(/(\r\n|\n|\r)/g, ' '); - as = $$('#full-board-list a[title]', Header.boardList); re = /[\w@]+(-(all|title|replace|full|index|catalog|archive|expired|(mode|sort|text):"[^"]+"(,"[^"]+")?))*|[^\w@]+/g; nodes = (function() { var j, len, ref, results; @@ -9537,14 +9540,14 @@ Header = (function() { results = []; for (j = 0, len = ref.length; j < len; j++) { t = ref[j]; - results.push(Header.mapCustomNavigation(t, as)); + results.push(Header.mapCustomNavigation(t)); } return results; })(); $.add(list, nodes); return CatalogLinks.setLinks(list); }, - mapCustomNavigation: function(t, as) { + mapCustomNavigation: function(t) { var a, boardID, href, indexOptions, m, text, url; if (/^[^\w@]/.test(t)) { return $.tn(t); @@ -9595,7 +9598,7 @@ Header = (function() { } } a = (function() { - var j, len, ref; + var ref; if (boardID === '@') { return $.el('a', { href: 'https://twitter.com/4chan', @@ -9603,15 +9606,10 @@ Header = (function() { textContent: '@' }); } - for (j = 0, len = as.length; j < len; j++) { - a = as[j]; - if (a.textContent === boardID) { - return a.cloneNode(true); - } - } a = $.el('a', { href: "//boards.4chan.org/" + boardID + "/", - textContent: boardID + textContent: boardID, + title: BoardConfig.title(boardID) }); if ((ref = g.VIEW) === 'catalog' || ref === 'archive') { a.href += g.VIEW; diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index fa018b43f..dd4cdd5e8 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 f9932d317..b3ce6974e 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.0.0 +// @version 1.14.0.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index e3ead7f0c..0455e486b 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.0.0 +// @version 1.14.0.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -157,7 +157,7 @@ docSet = function() { }; g = { - VERSION: '1.14.0.0', + VERSION: '1.14.0.1', NAMESPACE: '4chan X.', boards: {} }; @@ -8892,6 +8892,10 @@ BoardConfig = (function() { } boards = this.boards || Conf['boardConfig'].boards; return boards && !boards[boardID].webm_audio; + }, + title: function(boardID) { + var ref, ref1; + return ((ref = this.boards || Conf['boardConfig'].boards) != null ? (ref1 = ref[boardID]) != null ? ref1.title : void 0 : void 0) || ''; } }; @@ -9522,14 +9526,13 @@ Header = (function() { return CatalogLinks.setLinks(fullBoardList); }, generateBoardList: function(boardnav) { - var as, list, nodes, re, t; + var list, nodes, re, t; list = $('#custom-board-list', Header.boardList); $.rmAll(list); if (!boardnav) { return; } boardnav = boardnav.replace(/(\r\n|\n|\r)/g, ' '); - as = $$('#full-board-list a[title]', Header.boardList); re = /[\w@]+(-(all|title|replace|full|index|catalog|archive|expired|(mode|sort|text):"[^"]+"(,"[^"]+")?))*|[^\w@]+/g; nodes = (function() { var j, len, ref, results; @@ -9537,14 +9540,14 @@ Header = (function() { results = []; for (j = 0, len = ref.length; j < len; j++) { t = ref[j]; - results.push(Header.mapCustomNavigation(t, as)); + results.push(Header.mapCustomNavigation(t)); } return results; })(); $.add(list, nodes); return CatalogLinks.setLinks(list); }, - mapCustomNavigation: function(t, as) { + mapCustomNavigation: function(t) { var a, boardID, href, indexOptions, m, text, url; if (/^[^\w@]/.test(t)) { return $.tn(t); @@ -9595,7 +9598,7 @@ Header = (function() { } } a = (function() { - var j, len, ref; + var ref; if (boardID === '@') { return $.el('a', { href: 'https://twitter.com/4chan', @@ -9603,15 +9606,10 @@ Header = (function() { textContent: '@' }); } - for (j = 0, len = as.length; j < len; j++) { - a = as[j]; - if (a.textContent === boardID) { - return a.cloneNode(true); - } - } a = $.el('a', { href: "//boards.4chan.org/" + boardID + "/", - textContent: boardID + textContent: boardID, + title: BoardConfig.title(boardID) }); if ((ref = g.VIEW) === 'catalog' || ref === 'archive') { a.href += g.VIEW; diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 66c395aba..839eeaab0 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 e23fdbafa..b8cb8f403 100644 --- a/builds/updates-beta.json +++ b/builds/updates-beta.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.0.0", + "version": "1.14.0.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 b09617958..8d0a164ca 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 9ce10fadb..4948c83e3 100644 --- a/builds/updates.json +++ b/builds/updates.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.0.0", + "version": "1.14.0.1", "update_link": "https://www.4chan-x.net/builds/4chan-X.crx" } ] diff --git a/builds/updates.xml b/builds/updates.xml index 1531f10e4..7e606617c 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index b6ac32c22..2e79dff7a 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.14.0.0", - "date": "2018-01-24T16:27:06.567Z" + "version": "1.14.0.1", + "date": "2018-01-24T19:00:52.569Z" } \ No newline at end of file