diff --git a/CHANGELOG.md b/CHANGELOG.md index cdd004254..fe7b8d671 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ 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.22.6 +*2015-02-02* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.22.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.22.6/builds/4chan-X-noupdate.crx "Chromium version")] + +- Make `Image Hover` and `Image Hover in Catalog` independent options again. + ### v1.9.22.5 *2015-02-01* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.22.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.22.5/builds/4chan-X-noupdate.crx "Chromium version")] diff --git a/LICENSE b/LICENSE index e83c6ca93..25bdb9c27 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.9.22.5 +* 4chan X - Version 1.9.22.6 * * 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 6580c7609..58a0b6a05 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 5efd74bf9..fa40318ca 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.22.5 +// @version 1.9.22.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 77465d77e..f8d57ff99 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.22.5 +// @version 1.9.22.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.22.5 +* 4chan X - Version 1.9.22.6 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -180,8 +180,8 @@ 'Images and Videos': { 'Image Expansion': [true, 'Expand images / videos.'], 'Image Hover': [true, 'Show full image / video on mouseover.'], - 'Image Hover in Catalog': [false, 'Show full image / video on mouseover in 4chan X catalog.', 1], - 'Mouse Wheel Volume': [true, 'Adjust volume of hovering videos with mouse wheel.', 1], + 'Image Hover in Catalog': [false, 'Show full image / video on mouseover in 4chan X catalog.'], + 'Mouse Wheel Volume': [true, 'Adjust volume of hovering videos with mouse wheel.'], 'Gallery': [true, 'Adds a simple and cute image gallery.'], 'Fullscreen Gallery': [false, 'Open gallery in fullscreen mode.', 1], 'PDF in Gallery': [false, 'Show PDF files in gallery.', 1], @@ -401,7 +401,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.22.5', + VERSION: '1.9.22.6', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -9844,13 +9844,15 @@ ImageHover = { init: function() { var _ref; - if (!(Conf['Image Hover'] && ((_ref = g.VIEW) === 'index' || _ref === 'thread'))) { + if ((_ref = g.VIEW) !== 'index' && _ref !== 'thread') { return; } - Post.callbacks.push({ - name: 'Image Hover', - cb: this.node - }); + if (Conf['Image Hover']) { + Post.callbacks.push({ + name: 'Image Hover', + cb: this.node + }); + } if (Conf['Image Hover in Catalog']) { return CatalogThread.callbacks.push({ name: 'Image Hover', @@ -10253,7 +10255,7 @@ Volume = { init: function() { var unmuteEntry, volumeEntry, _ref, _ref1; - if (!(((_ref = g.VIEW) === 'index' || _ref === 'thread') && (Conf['Image Expansion'] || Conf['Image Hover'] || Conf['Gallery']))) { + if (!(((_ref = g.VIEW) === 'index' || _ref === 'thread') && (Conf['Image Expansion'] || Conf['Image Hover'] || Conf['Image Hover in Catalog'] || Conf['Gallery']))) { return; } $.sync('Allow Sound', function(x) { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 489af5a76..6ecaa6747 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 99958a2bc..a81c6f373 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.22.5 +// @version 1.9.22.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.22.5 +* 4chan X - Version 1.9.22.6 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -179,8 +179,8 @@ 'Images and Videos': { 'Image Expansion': [true, 'Expand images / videos.'], 'Image Hover': [true, 'Show full image / video on mouseover.'], - 'Image Hover in Catalog': [false, 'Show full image / video on mouseover in 4chan X catalog.', 1], - 'Mouse Wheel Volume': [true, 'Adjust volume of hovering videos with mouse wheel.', 1], + 'Image Hover in Catalog': [false, 'Show full image / video on mouseover in 4chan X catalog.'], + 'Mouse Wheel Volume': [true, 'Adjust volume of hovering videos with mouse wheel.'], 'Gallery': [true, 'Adds a simple and cute image gallery.'], 'Fullscreen Gallery': [false, 'Open gallery in fullscreen mode.', 1], 'PDF in Gallery': [false, 'Show PDF files in gallery.', 1], @@ -400,7 +400,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.22.5', + VERSION: '1.9.22.6', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -9843,13 +9843,15 @@ ImageHover = { init: function() { var _ref; - if (!(Conf['Image Hover'] && ((_ref = g.VIEW) === 'index' || _ref === 'thread'))) { + if ((_ref = g.VIEW) !== 'index' && _ref !== 'thread') { return; } - Post.callbacks.push({ - name: 'Image Hover', - cb: this.node - }); + if (Conf['Image Hover']) { + Post.callbacks.push({ + name: 'Image Hover', + cb: this.node + }); + } if (Conf['Image Hover in Catalog']) { return CatalogThread.callbacks.push({ name: 'Image Hover', @@ -10252,7 +10254,7 @@ Volume = { init: function() { var unmuteEntry, volumeEntry, _ref, _ref1; - if (!(((_ref = g.VIEW) === 'index' || _ref === 'thread') && (Conf['Image Expansion'] || Conf['Image Hover'] || Conf['Gallery']))) { + if (!(((_ref = g.VIEW) === 'index' || _ref === 'thread') && (Conf['Image Expansion'] || Conf['Image Hover'] || Conf['Image Hover in Catalog'] || Conf['Gallery']))) { return; } $.sync('Allow Sound', function(x) { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index b4e8fdde1..2f089264f 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 af201cea1..3969acf7c 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.9.22.5 +// @version 1.9.22.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 5f64335c2..bdce68a29 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.22.5 +// @version 1.9.22.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.22.5 +* 4chan X - Version 1.9.22.6 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -180,8 +180,8 @@ 'Images and Videos': { 'Image Expansion': [true, 'Expand images / videos.'], 'Image Hover': [true, 'Show full image / video on mouseover.'], - 'Image Hover in Catalog': [false, 'Show full image / video on mouseover in 4chan X catalog.', 1], - 'Mouse Wheel Volume': [true, 'Adjust volume of hovering videos with mouse wheel.', 1], + 'Image Hover in Catalog': [false, 'Show full image / video on mouseover in 4chan X catalog.'], + 'Mouse Wheel Volume': [true, 'Adjust volume of hovering videos with mouse wheel.'], 'Gallery': [true, 'Adds a simple and cute image gallery.'], 'Fullscreen Gallery': [false, 'Open gallery in fullscreen mode.', 1], 'PDF in Gallery': [false, 'Show PDF files in gallery.', 1], @@ -401,7 +401,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.22.5', + VERSION: '1.9.22.6', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -9844,13 +9844,15 @@ ImageHover = { init: function() { var _ref; - if (!(Conf['Image Hover'] && ((_ref = g.VIEW) === 'index' || _ref === 'thread'))) { + if ((_ref = g.VIEW) !== 'index' && _ref !== 'thread') { return; } - Post.callbacks.push({ - name: 'Image Hover', - cb: this.node - }); + if (Conf['Image Hover']) { + Post.callbacks.push({ + name: 'Image Hover', + cb: this.node + }); + } if (Conf['Image Hover in Catalog']) { return CatalogThread.callbacks.push({ name: 'Image Hover', @@ -10253,7 +10255,7 @@ Volume = { init: function() { var unmuteEntry, volumeEntry, _ref, _ref1; - if (!(((_ref = g.VIEW) === 'index' || _ref === 'thread') && (Conf['Image Expansion'] || Conf['Image Hover'] || Conf['Gallery']))) { + if (!(((_ref = g.VIEW) === 'index' || _ref === 'thread') && (Conf['Image Expansion'] || Conf['Image Hover'] || Conf['Image Hover in Catalog'] || Conf['Gallery']))) { return; } $.sync('Allow Sound', function(x) { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 9d34705b6..6c66395f2 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 5a89eae71..ba87630ed 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 252239ebf..6c2b76354 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 629f8ce69..c7bd1a90e 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.22.5", + "version": "1.9.22.6", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",