diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fc0df534..885fd0357 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ The attributions below are for work that has been incorporated into the script a The links to individual versions below are to copies of the script with the update URL removed. If you want automatic updates, install the script from the links on the [main page](https://github.com/ccd0/4chan-x). +### v1.9.11.1 +*2014-11-09* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.11.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.11.1/builds/4chan-X-noupdate.crx "Chromium version")] + +**ccd0** +- The IP count in the thread stats is now optional, controlled by the `IP Count in Stats` setting (default: on). + ### v1.9.11.0 *2014-11-09* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.11.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.11.0/builds/4chan-X-noupdate.crx "Chromium version")] diff --git a/LICENSE b/LICENSE index 6b88cab48..f951b61d3 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.9.11.0 +* 4chan X - Version 1.9.11.1 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index a0a2a493f..d7f7a8de8 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 f4c7a150c..ce8a361bc 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.9.11.0 +// @version 1.9.11.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 edae7b459..d9b0ab12b 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.9.11.0 +// @version 1.9.11.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.11.0 +* 4chan X - Version 1.9.11.1 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -212,7 +212,8 @@ 'Thread Excerpt': [true, 'Show an excerpt of the thread in the tab title for threads in /f/.'], 'Remove Thread Excerpt': [false, 'Replace the excerpt of the thread in the tab title with the board title.'], 'Thread Stats': [true, 'Display reply and image count.'], - 'Page Count in Stats': [true, 'Display the page count in the thread stats as well.'], + 'IP Count in Stats': [true, 'Display the unique IP count in the thread stats.'], + 'Page Count in Stats': [true, 'Display the page count in the thread stats.'], 'Updater and Stats in Header': [true, 'Places the thread updater and thread stats in the header instead of floating them.'], 'Thread Watcher': [true, 'Bookmark threads.'], 'Toggleable Thread Watcher': [true, 'Adds a shortcut for the thread watcher, hides the watcher by default, and makes it scroll with the page.'] @@ -383,7 +384,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.11.0', + VERSION: '1.9.11.1', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -10625,30 +10626,38 @@ ThreadStats = { init: function() { - var countHTML, sc; + var sc, statsHTML, statsTitle; if (g.VIEW !== 'thread' || !Conf['Thread Stats']) { return; } - countHTML = { - innerHTML: "? / ? / ?" + statsHTML = { + innerHTML: "? / ?" }; - if (Conf['Page Count in Stats']) { - countHTML = { - innerHTML: countHTML.innerHTML + " / ?" + statsTitle = 'Post Count / File Count'; + if (Conf['IP Count in Stats']) { + statsHTML = { + innerHTML: statsHTML.innerHTML + " / ?" }; + statsTitle += ' / IP Count'; + } + if (Conf['Page Count in Stats']) { + statsHTML = { + innerHTML: statsHTML.innerHTML + " / ?" + }; + statsTitle += ' / Page Count'; } if (Conf['Updater and Stats in Header']) { this.dialog = sc = $.el('span', { id: 'thread-stats', - title: 'Post Count / File Count / IP Count' + (Conf["Page Count in Stats"] ? " / Page Count" : "") + title: statsTitle }); - $.extend(sc, countHTML); + $.extend(sc, statsHTML); $.ready(function() { return Header.addShortcut(sc); }); } else { this.dialog = sc = UI.dialog('thread-stats', 'bottom: 0px; right: 0px;', { - innerHTML: "
" + countHTML.innerHTML + "
" + innerHTML: "
" + statsHTML.innerHTML + "
" }); $.ready((function(_this) { return function() { @@ -10713,7 +10722,9 @@ thread = ThreadStats.thread, postCountEl = ThreadStats.postCountEl, fileCountEl = ThreadStats.fileCountEl, ipCountEl = ThreadStats.ipCountEl; postCountEl.textContent = postCount; fileCountEl.textContent = fileCount; - ipCountEl.textContent = ipCount != null ? ipCount : '?'; + if (Conf["IP Count in Stats"]) { + ipCountEl.textContent = ipCount != null ? ipCount : '?'; + } (thread.postLimit && !thread.isSticky ? $.addClass : $.rmClass)(postCountEl, 'warning'); return (thread.fileLimit && !thread.isSticky ? $.addClass : $.rmClass)(fileCountEl, 'warning'); }, @@ -13760,7 +13771,7 @@ className: 'dialog' }); $.extend(dialog, { - innerHTML: "
" + innerHTML: "
" }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 3a7837c01..5c5d9904c 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 eb88a44b6..4c298d609 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.9.11.0 +// @version 1.9.11.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -23,7 +23,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.11.0 +* 4chan X - Version 1.9.11.1 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -211,7 +211,8 @@ 'Thread Excerpt': [true, 'Show an excerpt of the thread in the tab title for threads in /f/.'], 'Remove Thread Excerpt': [false, 'Replace the excerpt of the thread in the tab title with the board title.'], 'Thread Stats': [true, 'Display reply and image count.'], - 'Page Count in Stats': [true, 'Display the page count in the thread stats as well.'], + 'IP Count in Stats': [true, 'Display the unique IP count in the thread stats.'], + 'Page Count in Stats': [true, 'Display the page count in the thread stats.'], 'Updater and Stats in Header': [true, 'Places the thread updater and thread stats in the header instead of floating them.'], 'Thread Watcher': [true, 'Bookmark threads.'], 'Toggleable Thread Watcher': [true, 'Adds a shortcut for the thread watcher, hides the watcher by default, and makes it scroll with the page.'] @@ -382,7 +383,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.11.0', + VERSION: '1.9.11.1', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -10624,30 +10625,38 @@ ThreadStats = { init: function() { - var countHTML, sc; + var sc, statsHTML, statsTitle; if (g.VIEW !== 'thread' || !Conf['Thread Stats']) { return; } - countHTML = { - innerHTML: "? / ? / ?" + statsHTML = { + innerHTML: "? / ?" }; - if (Conf['Page Count in Stats']) { - countHTML = { - innerHTML: countHTML.innerHTML + " / ?" + statsTitle = 'Post Count / File Count'; + if (Conf['IP Count in Stats']) { + statsHTML = { + innerHTML: statsHTML.innerHTML + " / ?" }; + statsTitle += ' / IP Count'; + } + if (Conf['Page Count in Stats']) { + statsHTML = { + innerHTML: statsHTML.innerHTML + " / ?" + }; + statsTitle += ' / Page Count'; } if (Conf['Updater and Stats in Header']) { this.dialog = sc = $.el('span', { id: 'thread-stats', - title: 'Post Count / File Count / IP Count' + (Conf["Page Count in Stats"] ? " / Page Count" : "") + title: statsTitle }); - $.extend(sc, countHTML); + $.extend(sc, statsHTML); $.ready(function() { return Header.addShortcut(sc); }); } else { this.dialog = sc = UI.dialog('thread-stats', 'bottom: 0px; right: 0px;', { - innerHTML: "
" + countHTML.innerHTML + "
" + innerHTML: "
" + statsHTML.innerHTML + "
" }); $.ready((function(_this) { return function() { @@ -10712,7 +10721,9 @@ thread = ThreadStats.thread, postCountEl = ThreadStats.postCountEl, fileCountEl = ThreadStats.fileCountEl, ipCountEl = ThreadStats.ipCountEl; postCountEl.textContent = postCount; fileCountEl.textContent = fileCount; - ipCountEl.textContent = ipCount != null ? ipCount : '?'; + if (Conf["IP Count in Stats"]) { + ipCountEl.textContent = ipCount != null ? ipCount : '?'; + } (thread.postLimit && !thread.isSticky ? $.addClass : $.rmClass)(postCountEl, 'warning'); return (thread.fileLimit && !thread.isSticky ? $.addClass : $.rmClass)(fileCountEl, 'warning'); }, @@ -13759,7 +13770,7 @@ className: 'dialog' }); $.extend(dialog, { - innerHTML: "
" + innerHTML: "
" }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index fde3f0763..2bdd0a419 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 ce4fbb1a1..5cd6ce00c 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.9.11.0 +// @version 1.9.11.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 7b4ccca8e..2305b1ea3 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.9.11.0 +// @version 1.9.11.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.11.0 +* 4chan X - Version 1.9.11.1 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -212,7 +212,8 @@ 'Thread Excerpt': [true, 'Show an excerpt of the thread in the tab title for threads in /f/.'], 'Remove Thread Excerpt': [false, 'Replace the excerpt of the thread in the tab title with the board title.'], 'Thread Stats': [true, 'Display reply and image count.'], - 'Page Count in Stats': [true, 'Display the page count in the thread stats as well.'], + 'IP Count in Stats': [true, 'Display the unique IP count in the thread stats.'], + 'Page Count in Stats': [true, 'Display the page count in the thread stats.'], 'Updater and Stats in Header': [true, 'Places the thread updater and thread stats in the header instead of floating them.'], 'Thread Watcher': [true, 'Bookmark threads.'], 'Toggleable Thread Watcher': [true, 'Adds a shortcut for the thread watcher, hides the watcher by default, and makes it scroll with the page.'] @@ -383,7 +384,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.11.0', + VERSION: '1.9.11.1', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -10625,30 +10626,38 @@ ThreadStats = { init: function() { - var countHTML, sc; + var sc, statsHTML, statsTitle; if (g.VIEW !== 'thread' || !Conf['Thread Stats']) { return; } - countHTML = { - innerHTML: "? / ? / ?" + statsHTML = { + innerHTML: "? / ?" }; - if (Conf['Page Count in Stats']) { - countHTML = { - innerHTML: countHTML.innerHTML + " / ?" + statsTitle = 'Post Count / File Count'; + if (Conf['IP Count in Stats']) { + statsHTML = { + innerHTML: statsHTML.innerHTML + " / ?" }; + statsTitle += ' / IP Count'; + } + if (Conf['Page Count in Stats']) { + statsHTML = { + innerHTML: statsHTML.innerHTML + " / ?" + }; + statsTitle += ' / Page Count'; } if (Conf['Updater and Stats in Header']) { this.dialog = sc = $.el('span', { id: 'thread-stats', - title: 'Post Count / File Count / IP Count' + (Conf["Page Count in Stats"] ? " / Page Count" : "") + title: statsTitle }); - $.extend(sc, countHTML); + $.extend(sc, statsHTML); $.ready(function() { return Header.addShortcut(sc); }); } else { this.dialog = sc = UI.dialog('thread-stats', 'bottom: 0px; right: 0px;', { - innerHTML: "
" + countHTML.innerHTML + "
" + innerHTML: "
" + statsHTML.innerHTML + "
" }); $.ready((function(_this) { return function() { @@ -10713,7 +10722,9 @@ thread = ThreadStats.thread, postCountEl = ThreadStats.postCountEl, fileCountEl = ThreadStats.fileCountEl, ipCountEl = ThreadStats.ipCountEl; postCountEl.textContent = postCount; fileCountEl.textContent = fileCount; - ipCountEl.textContent = ipCount != null ? ipCount : '?'; + if (Conf["IP Count in Stats"]) { + ipCountEl.textContent = ipCount != null ? ipCount : '?'; + } (thread.postLimit && !thread.isSticky ? $.addClass : $.rmClass)(postCountEl, 'warning'); return (thread.fileLimit && !thread.isSticky ? $.addClass : $.rmClass)(fileCountEl, 'warning'); }, @@ -13760,7 +13771,7 @@ className: 'dialog' }); $.extend(dialog, { - innerHTML: "
" + innerHTML: "
" }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index d270643a6..9708b9eee 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 cdf101e72..d7f718db5 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 c0cf49443..48c587d84 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 4f45e04b6..61277bcae 100755 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", - "version": "1.9.11.0", + "version": "1.9.11.1", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",