diff --git a/CHANGELOG.md b/CHANGELOG.md index e46895020..8ecf78668 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.3 +**v1.10.3.6** *(2015-03-03)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.3.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.3.6/builds/4chan-X-noupdate.crx "Chromium version")] +- Restore index notifications for users who select the new option `Index Refresh Notifications` (off by default). + **v1.10.3.5** *(2015-03-02)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.3.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.3.5/builds/4chan-X-noupdate.crx "Chromium version")] - Remove focus outlines around links only when they were focused with the mouse. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index fe7a050af..5a99c5f95 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 847c1520c..be3be8893 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.3.5 +// @version 1.10.3.6 // @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 79903d0e9..70fee6eb6 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.3.5 +// @version 1.10.3.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -121,6 +121,7 @@ 'Miscellaneous': { 'JSON Navigation': [true, 'Replace the original board index with one supporting searching, sorting, infinite scrolling, and a catalog mode.'], 'Use 4chan X Catalog': [true, 'Link to 4chan X\'s catalog instead of the native 4chan one.', 1], + 'Index Refresh Notifications': [false, 'Show a notice at the top of the page when the index is refreshed.', 1], 'External Catalog': [false, 'Link to external catalog instead of the internal one.'], 'Catalog Links': [false, 'Add toggle link in header menu to turn Navigation links into links to each board\'s catalog.'], 'Announcement Hiding': [true, 'Add button to hide 4chan announcements.'], @@ -393,7 +394,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.3.5', + VERSION: '1.10.3.6', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -3574,14 +3575,18 @@ if ((ref1 = Index.notice) != null) { ref1.close(); } - now = Date.now(); - $.ready(function() { - return Index.nTimeout = setTimeout((function() { - if (Index.req && !Index.notice) { - return Index.notice = new Notice('info', 'Refreshing index...', 2); - } - }), 3 * $.SECOND - (Date.now() - now)); - }); + if (Conf['Index Refresh Notifications'] && d.readyState !== 'loading') { + Index.notice = new Notice('info', 'Refreshing index...'); + } else { + now = Date.now(); + $.ready(function() { + return Index.nTimeout = setTimeout((function() { + if (Index.req && !Index.notice) { + return Index.notice = new Notice('info', 'Refreshing index...'); + } + }), 3 * $.SECOND - (Date.now() - now)); + }); + } Index.req = $.ajax("//a.4cdn.org/" + g.BOARD + "/catalog.json", { onloadend: function(e) { return Index.load(e, state); @@ -3635,6 +3640,15 @@ } return; } + if (notice) { + if (Conf['Index Refresh Notifications']) { + notice.setType('success'); + notice.el.lastElementChild.textContent = 'Index refreshed!'; + setTimeout(notice.close, $.SECOND); + } else { + notice.close(); + } + } timeEl = $('#index-last-refresh time', Index.navLinks); timeEl.dataset.utc = Date.parse(req.getResponseHeader('Last-Modified')); RelativeDates.update(timeEl); diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index dd3cc1415..44078e796 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 ee9f0b105..d35f967d9 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.3.5 +// @version 1.10.3.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -120,6 +120,7 @@ 'Miscellaneous': { 'JSON Navigation': [true, 'Replace the original board index with one supporting searching, sorting, infinite scrolling, and a catalog mode.'], 'Use 4chan X Catalog': [true, 'Link to 4chan X\'s catalog instead of the native 4chan one.', 1], + 'Index Refresh Notifications': [false, 'Show a notice at the top of the page when the index is refreshed.', 1], 'External Catalog': [false, 'Link to external catalog instead of the internal one.'], 'Catalog Links': [false, 'Add toggle link in header menu to turn Navigation links into links to each board\'s catalog.'], 'Announcement Hiding': [true, 'Add button to hide 4chan announcements.'], @@ -392,7 +393,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.3.5', + VERSION: '1.10.3.6', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -3573,14 +3574,18 @@ if ((ref1 = Index.notice) != null) { ref1.close(); } - now = Date.now(); - $.ready(function() { - return Index.nTimeout = setTimeout((function() { - if (Index.req && !Index.notice) { - return Index.notice = new Notice('info', 'Refreshing index...', 2); - } - }), 3 * $.SECOND - (Date.now() - now)); - }); + if (Conf['Index Refresh Notifications'] && d.readyState !== 'loading') { + Index.notice = new Notice('info', 'Refreshing index...'); + } else { + now = Date.now(); + $.ready(function() { + return Index.nTimeout = setTimeout((function() { + if (Index.req && !Index.notice) { + return Index.notice = new Notice('info', 'Refreshing index...'); + } + }), 3 * $.SECOND - (Date.now() - now)); + }); + } Index.req = $.ajax("//a.4cdn.org/" + g.BOARD + "/catalog.json", { onloadend: function(e) { return Index.load(e, state); @@ -3634,6 +3639,15 @@ } return; } + if (notice) { + if (Conf['Index Refresh Notifications']) { + notice.setType('success'); + notice.el.lastElementChild.textContent = 'Index refreshed!'; + setTimeout(notice.close, $.SECOND); + } else { + notice.close(); + } + } timeEl = $('#index-last-refresh time', Index.navLinks); timeEl.dataset.utc = Date.parse(req.getResponseHeader('Last-Modified')); RelativeDates.update(timeEl); diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 2609c3569..8ed9a491d 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 7ac053734..674f254d6 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.10.3.5 +// @version 1.10.3.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 54f03f972..3fbcd1c34 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.3.5 +// @version 1.10.3.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -121,6 +121,7 @@ 'Miscellaneous': { 'JSON Navigation': [true, 'Replace the original board index with one supporting searching, sorting, infinite scrolling, and a catalog mode.'], 'Use 4chan X Catalog': [true, 'Link to 4chan X\'s catalog instead of the native 4chan one.', 1], + 'Index Refresh Notifications': [false, 'Show a notice at the top of the page when the index is refreshed.', 1], 'External Catalog': [false, 'Link to external catalog instead of the internal one.'], 'Catalog Links': [false, 'Add toggle link in header menu to turn Navigation links into links to each board\'s catalog.'], 'Announcement Hiding': [true, 'Add button to hide 4chan announcements.'], @@ -393,7 +394,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.3.5', + VERSION: '1.10.3.6', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -3574,14 +3575,18 @@ if ((ref1 = Index.notice) != null) { ref1.close(); } - now = Date.now(); - $.ready(function() { - return Index.nTimeout = setTimeout((function() { - if (Index.req && !Index.notice) { - return Index.notice = new Notice('info', 'Refreshing index...', 2); - } - }), 3 * $.SECOND - (Date.now() - now)); - }); + if (Conf['Index Refresh Notifications'] && d.readyState !== 'loading') { + Index.notice = new Notice('info', 'Refreshing index...'); + } else { + now = Date.now(); + $.ready(function() { + return Index.nTimeout = setTimeout((function() { + if (Index.req && !Index.notice) { + return Index.notice = new Notice('info', 'Refreshing index...'); + } + }), 3 * $.SECOND - (Date.now() - now)); + }); + } Index.req = $.ajax("//a.4cdn.org/" + g.BOARD + "/catalog.json", { onloadend: function(e) { return Index.load(e, state); @@ -3635,6 +3640,15 @@ } return; } + if (notice) { + if (Conf['Index Refresh Notifications']) { + notice.setType('success'); + notice.el.lastElementChild.textContent = 'Index refreshed!'; + setTimeout(notice.close, $.SECOND); + } else { + notice.close(); + } + } timeEl = $('#index-last-refresh time', Index.navLinks); timeEl.dataset.utc = Date.parse(req.getResponseHeader('Last-Modified')); RelativeDates.update(timeEl); diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 6a667f6f2..c6a579d48 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 a0f50b7e6..bf001a67a 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 f6eae479f..f98045609 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 434eef929..a2c82d95f 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.3.5", - "date": "2015-03-03T04:48:15.000Z", + "version": "1.10.3.6", + "date": "2015-03-03T21:07:43.922Z", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",