diff --git a/CHANGELOG.md b/CHANGELOG.md index f6895ee44..04b7b6d9a 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor ### v1.11.7 +**v1.11.7.2** *(2015-08-05)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.7.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.7.2/builds/4chan-X-noupdate.crx "Chromium version")] +- Merge v1.11.6.2: Fix bug where clicking on scrollbar of captcha image selection bubble could mess up the captcha. +- Redirect threads deleted but with stubs left behind to archive. + **v1.11.7.1** *(2015-08-02)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.7.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.7.1/builds/4chan-X-noupdate.crx "Chromium version")] - Merge v1.11.6.1: Update banner list. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index bc215b558..bebc4ddfb 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 87224edc9..d7c6b1b2a 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.7.1 +// @version 1.11.7.2 // @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 752240f88..7b789c428 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.7.1 +// @version 1.11.7.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -411,7 +411,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.7.1', + VERSION: '1.11.7.2', NAMESPACE: '4chan X.', boards: {} }; @@ -6997,8 +6997,11 @@ }); }, inBubble: function() { - var ref; - return ref = d.activeElement, indexOf.call($$('.goog-bubble-content > iframe'), ref) >= 0; + var bubbles, ref; + bubbles = $$('.goog-bubble-content > iframe'); + return (ref = d.activeElement, indexOf.call(bubbles, ref) >= 0) || bubbles.some(function(el) { + return el.getBoundingClientRect().bottom > 0; + }); }, inCaptcha: function() { var ref; @@ -17231,18 +17234,19 @@ }, initReady: function() { var err, passLink, ref, styleSelector; + if (g.VIEW === 'thread' && !$('.opContainer')) { + ThreadWatcher.set404(g.BOARD.ID, g.THREADID, function() { + if (Conf['404 Redirect']) { + return Redirect.navigate('thread', { + boardID: g.BOARD.ID, + threadID: g.THREADID, + postID: +location.hash.match(/\d+/) + }, "/" + g.BOARD + "/"); + } + }); + return; + } if ((ref = d.title) === '4chan - Temporarily Offline' || ref === '4chan - 404 Not Found') { - if (g.VIEW === 'thread') { - ThreadWatcher.set404(g.BOARD.ID, g.THREADID, function() { - if (Conf['404 Redirect']) { - return Redirect.navigate('thread', { - boardID: g.BOARD.ID, - threadID: g.THREADID, - postID: +location.hash.match(/\d+/) - }, "/" + g.BOARD + "/"); - } - }); - } return; } if (styleSelector = $.id('styleSelector')) { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 682387cbe..0c39249d1 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 5cd4a3337..1eb5f3ff1 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.7.1 +// @version 1.11.7.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -410,7 +410,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.7.1', + VERSION: '1.11.7.2', NAMESPACE: '4chan X.', boards: {} }; @@ -6996,8 +6996,11 @@ }); }, inBubble: function() { - var ref; - return ref = d.activeElement, indexOf.call($$('.goog-bubble-content > iframe'), ref) >= 0; + var bubbles, ref; + bubbles = $$('.goog-bubble-content > iframe'); + return (ref = d.activeElement, indexOf.call(bubbles, ref) >= 0) || bubbles.some(function(el) { + return el.getBoundingClientRect().bottom > 0; + }); }, inCaptcha: function() { var ref; @@ -17230,18 +17233,19 @@ }, initReady: function() { var err, passLink, ref, styleSelector; + if (g.VIEW === 'thread' && !$('.opContainer')) { + ThreadWatcher.set404(g.BOARD.ID, g.THREADID, function() { + if (Conf['404 Redirect']) { + return Redirect.navigate('thread', { + boardID: g.BOARD.ID, + threadID: g.THREADID, + postID: +location.hash.match(/\d+/) + }, "/" + g.BOARD + "/"); + } + }); + return; + } if ((ref = d.title) === '4chan - Temporarily Offline' || ref === '4chan - 404 Not Found') { - if (g.VIEW === 'thread') { - ThreadWatcher.set404(g.BOARD.ID, g.THREADID, function() { - if (Conf['404 Redirect']) { - return Redirect.navigate('thread', { - boardID: g.BOARD.ID, - threadID: g.THREADID, - postID: +location.hash.match(/\d+/) - }, "/" + g.BOARD + "/"); - } - }); - } return; } if (styleSelector = $.id('styleSelector')) { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index a90cbb06c..a6a0a1597 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 1e622e2d8..effbdb16f 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.11.7.1 +// @version 1.11.7.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index b434c9ede..af83d30e0 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.7.1 +// @version 1.11.7.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -411,7 +411,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.7.1', + VERSION: '1.11.7.2', NAMESPACE: '4chan X.', boards: {} }; @@ -6997,8 +6997,11 @@ }); }, inBubble: function() { - var ref; - return ref = d.activeElement, indexOf.call($$('.goog-bubble-content > iframe'), ref) >= 0; + var bubbles, ref; + bubbles = $$('.goog-bubble-content > iframe'); + return (ref = d.activeElement, indexOf.call(bubbles, ref) >= 0) || bubbles.some(function(el) { + return el.getBoundingClientRect().bottom > 0; + }); }, inCaptcha: function() { var ref; @@ -17231,18 +17234,19 @@ }, initReady: function() { var err, passLink, ref, styleSelector; + if (g.VIEW === 'thread' && !$('.opContainer')) { + ThreadWatcher.set404(g.BOARD.ID, g.THREADID, function() { + if (Conf['404 Redirect']) { + return Redirect.navigate('thread', { + boardID: g.BOARD.ID, + threadID: g.THREADID, + postID: +location.hash.match(/\d+/) + }, "/" + g.BOARD + "/"); + } + }); + return; + } if ((ref = d.title) === '4chan - Temporarily Offline' || ref === '4chan - 404 Not Found') { - if (g.VIEW === 'thread') { - ThreadWatcher.set404(g.BOARD.ID, g.THREADID, function() { - if (Conf['404 Redirect']) { - return Redirect.navigate('thread', { - boardID: g.BOARD.ID, - threadID: g.THREADID, - postID: +location.hash.match(/\d+/) - }, "/" + g.BOARD + "/"); - } - }); - } return; } if (styleSelector = $.id('styleSelector')) { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index f379234fb..4dbbac6c1 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 558fda3d4..adc572840 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 8b8445d5b..e511d2a49 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index ad68a1cf4..fc82b058e 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.11.7.1", - "date": "2015-08-03T00:53:16.358Z", + "version": "1.11.7.2", + "date": "2015-08-06T02:24:55.521Z", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",