diff --git a/CHANGELOG.md b/CHANGELOG.md index 396c26eab..2f2b80d43 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ The links to individual versions below are to copies of the script with the upda ### v1.10.8 +**v1.10.8.1** *(2015-04-05)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.8.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.8.1/builds/4chan-X-noupdate.crx "Chromium version")] +- Merge v1.10.7.5: Fix 'Last Index Refresh' button refreshing twice when Refreshed Navigation is on. + **v1.10.8.0** *(2015-04-05)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.8.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.8.0/builds/4chan-X-noupdate.crx "Chromium version")] - Based on v1.10.7.4. - Make the thread watcher remember whether it was closed or open. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index dbc1db9a3..90e7cfc69 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 fd126169b..6c019cd74 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.8.0 +// @version 1.10.8.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 f0d5592bf..305deb4db 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.8.0 +// @version 1.10.8.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -396,7 +396,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.8.0', + VERSION: '1.10.8.1', NAMESPACE: '4chan X.', boards: {} }; @@ -3378,8 +3378,10 @@ return Index.userPageNav(+a.pathname.split('/')[2] || 1); }, refreshFront: function() { - Index.userPageNav(1); - return Index.update(); + return Index.update(Index.pushState({ + page: 1, + scroll: true + })); } }, scrollToIndex: function() { @@ -3393,13 +3395,13 @@ return +window.location.pathname.split('/')[2] || 1; } }, - userPageNav: function(page, noRefresh) { + userPageNav: function(page) { var state; state = Index.pushState({ page: page, scroll: true }); - if (Conf['Refreshed Navigation'] && !noRefresh) { + if (Conf['Refreshed Navigation']) { return Index.update(state); } else { if (state.page) { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index e691308b6..f53e2520e 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 de1456d81..a632c387b 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.8.0 +// @version 1.10.8.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -395,7 +395,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.8.0', + VERSION: '1.10.8.1', NAMESPACE: '4chan X.', boards: {} }; @@ -3377,8 +3377,10 @@ return Index.userPageNav(+a.pathname.split('/')[2] || 1); }, refreshFront: function() { - Index.userPageNav(1); - return Index.update(); + return Index.update(Index.pushState({ + page: 1, + scroll: true + })); } }, scrollToIndex: function() { @@ -3392,13 +3394,13 @@ return +window.location.pathname.split('/')[2] || 1; } }, - userPageNav: function(page, noRefresh) { + userPageNav: function(page) { var state; state = Index.pushState({ page: page, scroll: true }); - if (Conf['Refreshed Navigation'] && !noRefresh) { + if (Conf['Refreshed Navigation']) { return Index.update(state); } else { if (state.page) { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index d9b1d6514..f6b21b981 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 4d94693ba..23ad1363a 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.10.8.0 +// @version 1.10.8.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 1ead5238c..30c9b821a 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.8.0 +// @version 1.10.8.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -396,7 +396,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.8.0', + VERSION: '1.10.8.1', NAMESPACE: '4chan X.', boards: {} }; @@ -3378,8 +3378,10 @@ return Index.userPageNav(+a.pathname.split('/')[2] || 1); }, refreshFront: function() { - Index.userPageNav(1); - return Index.update(); + return Index.update(Index.pushState({ + page: 1, + scroll: true + })); } }, scrollToIndex: function() { @@ -3393,13 +3395,13 @@ return +window.location.pathname.split('/')[2] || 1; } }, - userPageNav: function(page, noRefresh) { + userPageNav: function(page) { var state; state = Index.pushState({ page: page, scroll: true }); - if (Conf['Refreshed Navigation'] && !noRefresh) { + if (Conf['Refreshed Navigation']) { return Index.update(state); } else { if (state.page) { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 53ddde54b..8f8ecd822 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 3867a0937..23b151403 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 e0c2af7b3..6bef27a9a 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 02d23bb72..1a86d681d 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.8.0", - "date": "2015-04-05T22:25:55.676Z", + "version": "1.10.8.1", + "date": "2015-04-06T02:39:48.308Z", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",