diff --git a/CHANGELOG.md b/CHANGELOG.md index cc5a3db2c..c234495e8 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ The links to individual versions below are to copies of the script with the upda ### v1.10.11 +**v1.10.11.8** *(2015-05-02)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.11.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.11.8/builds/4chan-X-noupdate.crx "Chromium version")] + **v1.10.11.7** *(2015-05-02)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.11.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.11.7/builds/4chan-X-noupdate.crx "Chromium version")] - Fix "PDF" being parsed as a Flash tag. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 8af8dd760..103928cd7 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 a5daeff89..b0fc5c242 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.10.11.7 +// @version 1.10.11.8 // @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 2c1b36502..dd61cc1c9 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.10.11.7 +// @version 1.10.11.8 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -396,7 +396,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.11.7', + VERSION: '1.10.11.8', NAMESPACE: '4chan X.', boards: {} }; @@ -4178,6 +4178,8 @@ quote.href = ("/" + boardID + "/thread/" + threadID) + href; } else if ((match = href.match(/^\/([^\/]+)\/thread\/(\d+)/)) && (Build.sameThread(match[1], match[2]))) { quote.href = href.match(/(#[^#]*)?$/)[0] || '#'; + } else if (/^\d+(#|$)/.test(href) && !(g.VIEW === 'thread' && g.BOARD.ID === boardID)) { + quote.href = "/" + boardID + "/thread/" + href; } } return container; @@ -12852,7 +12854,7 @@ continue; } quotesYou = false; - regexp = /]*\bhref="(?:\/([^\/]+)\/thread\/(\d+))?(?:#p(\d+))?"/g; + regexp = /]*\bhref="(?:\/([^\/]+)\/thread\/)?(\d+)?(?:#p(\d+))?"/g; while (match = regexp.exec(postObj.com)) { if (QR.db.get({ boardID: match[1] || boardID, diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 7e8c042ae..42c656cde 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 edc1c918e..0d42b7e96 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.10.11.7 +// @version 1.10.11.8 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -395,7 +395,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.11.7', + VERSION: '1.10.11.8', NAMESPACE: '4chan X.', boards: {} }; @@ -4177,6 +4177,8 @@ quote.href = ("/" + boardID + "/thread/" + threadID) + href; } else if ((match = href.match(/^\/([^\/]+)\/thread\/(\d+)/)) && (Build.sameThread(match[1], match[2]))) { quote.href = href.match(/(#[^#]*)?$/)[0] || '#'; + } else if (/^\d+(#|$)/.test(href) && !(g.VIEW === 'thread' && g.BOARD.ID === boardID)) { + quote.href = "/" + boardID + "/thread/" + href; } } return container; @@ -12851,7 +12853,7 @@ continue; } quotesYou = false; - regexp = /]*\bhref="(?:\/([^\/]+)\/thread\/(\d+))?(?:#p(\d+))?"/g; + regexp = /]*\bhref="(?:\/([^\/]+)\/thread\/)?(\d+)?(?:#p(\d+))?"/g; while (match = regexp.exec(postObj.com)) { if (QR.db.get({ boardID: match[1] || boardID, diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 6f4bdbe58..756f74c70 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 eb61d2e00..7be3e4671 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.10.11.7 +// @version 1.10.11.8 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index bb771a3c7..0f394ccb5 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.10.11.7 +// @version 1.10.11.8 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -396,7 +396,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.11.7', + VERSION: '1.10.11.8', NAMESPACE: '4chan X.', boards: {} }; @@ -4178,6 +4178,8 @@ quote.href = ("/" + boardID + "/thread/" + threadID) + href; } else if ((match = href.match(/^\/([^\/]+)\/thread\/(\d+)/)) && (Build.sameThread(match[1], match[2]))) { quote.href = href.match(/(#[^#]*)?$/)[0] || '#'; + } else if (/^\d+(#|$)/.test(href) && !(g.VIEW === 'thread' && g.BOARD.ID === boardID)) { + quote.href = "/" + boardID + "/thread/" + href; } } return container; @@ -12852,7 +12854,7 @@ continue; } quotesYou = false; - regexp = /]*\bhref="(?:\/([^\/]+)\/thread\/(\d+))?(?:#p(\d+))?"/g; + regexp = /]*\bhref="(?:\/([^\/]+)\/thread\/)?(\d+)?(?:#p(\d+))?"/g; while (match = regexp.exec(postObj.com)) { if (QR.db.get({ boardID: match[1] || boardID, diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index fc95e0378..d7fc5aaa9 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 91540a64d..447357ceb 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 09fa09137..0a08cd2f2 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 0aa2102bd..5ff6de782 100755 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", - "version": "1.10.11.7", - "date": "2015-05-02T22:38:38.614Z", + "version": "1.10.11.8", + "date": "2015-05-03T01:06:32.356Z", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",