diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c84dfa21..ae8a80420 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.3 +*2015-02-01* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.22.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.22.3/builds/4chan-X-noupdate.crx "Chromium version")] + +- Add option `Volume in New Tab` (on by default) to apply 4chan X mute/volume settings to videos opened in a new tab. + ### v1.9.22.2 *2015-02-01* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.22.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.22.2/builds/4chan-X-noupdate.crx "Chromium version")] diff --git a/LICENSE b/LICENSE index 53c56612e..bf6d37999 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.9.22.2 +* 4chan X - Version 1.9.22.3 * * 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 0db63eacd..5a1b6b17e 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 83fb4d348..0bef16eb7 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.2 +// @version 1.9.22.3 // @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 0c62e8c09..25f71b529 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.2 +// @version 1.9.22.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.22.2 +* 4chan X - Version 1.9.22.3 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -199,7 +199,8 @@ 'Show Controls': [true, 'Show controls on videos expanded inline.'], 'Click Passthrough': [false, 'Clicks on videos trigger your browser\'s default behavior. Videos can be contracted with button / dragging to the left.', 1], 'Allow Sound': [true, 'Open videos with the sound unmuted.'], - 'Loop in New Tab': [true, 'Loop videos opened in their own tabs.'] + 'Loop in New Tab': [true, 'Loop videos opened in their own tabs.'], + 'Volume in New Tab': [true, 'Apply 4chan X mute and volume settings to videos opened in their own tabs.'] }, 'Menu': { 'Menu': [true, 'Add a drop-down menu to posts.'], @@ -400,7 +401,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.22.2', + VERSION: '1.9.22.3', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -15693,11 +15694,16 @@ filename: pathname[pathname.length - 1] }); return Redirect.navigate(URL); - } else if (Conf['Loop in New Tab'] && (video = $('video'))) { - video.loop = true; - video.controls = false; - video.play(); - return ImageCommon.addControls(video); + } else if (video = $('video')) { + if (Conf['Volume in New Tab']) { + Volume.setup(video); + } + if (Conf['Loop in New Tab']) { + video.loop = true; + video.controls = false; + video.play(); + return ImageCommon.addControls(video); + } } }); return; diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 648f32e70..c45d2a294 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 2f7d8c5dd..fa3cdc88a 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.2 +// @version 1.9.22.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.22.2 +* 4chan X - Version 1.9.22.3 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -198,7 +198,8 @@ 'Show Controls': [true, 'Show controls on videos expanded inline.'], 'Click Passthrough': [false, 'Clicks on videos trigger your browser\'s default behavior. Videos can be contracted with button / dragging to the left.', 1], 'Allow Sound': [true, 'Open videos with the sound unmuted.'], - 'Loop in New Tab': [true, 'Loop videos opened in their own tabs.'] + 'Loop in New Tab': [true, 'Loop videos opened in their own tabs.'], + 'Volume in New Tab': [true, 'Apply 4chan X mute and volume settings to videos opened in their own tabs.'] }, 'Menu': { 'Menu': [true, 'Add a drop-down menu to posts.'], @@ -399,7 +400,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.22.2', + VERSION: '1.9.22.3', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -15692,11 +15693,16 @@ filename: pathname[pathname.length - 1] }); return Redirect.navigate(URL); - } else if (Conf['Loop in New Tab'] && (video = $('video'))) { - video.loop = true; - video.controls = false; - video.play(); - return ImageCommon.addControls(video); + } else if (video = $('video')) { + if (Conf['Volume in New Tab']) { + Volume.setup(video); + } + if (Conf['Loop in New Tab']) { + video.loop = true; + video.controls = false; + video.play(); + return ImageCommon.addControls(video); + } } }); return; diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 98d110b18..6cfdea204 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 b96da6b45..e1676abb3 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.2 +// @version 1.9.22.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 99ca053dc..53059cfb4 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.2 +// @version 1.9.22.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.22.2 +* 4chan X - Version 1.9.22.3 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -199,7 +199,8 @@ 'Show Controls': [true, 'Show controls on videos expanded inline.'], 'Click Passthrough': [false, 'Clicks on videos trigger your browser\'s default behavior. Videos can be contracted with button / dragging to the left.', 1], 'Allow Sound': [true, 'Open videos with the sound unmuted.'], - 'Loop in New Tab': [true, 'Loop videos opened in their own tabs.'] + 'Loop in New Tab': [true, 'Loop videos opened in their own tabs.'], + 'Volume in New Tab': [true, 'Apply 4chan X mute and volume settings to videos opened in their own tabs.'] }, 'Menu': { 'Menu': [true, 'Add a drop-down menu to posts.'], @@ -400,7 +401,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.22.2', + VERSION: '1.9.22.3', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -15693,11 +15694,16 @@ filename: pathname[pathname.length - 1] }); return Redirect.navigate(URL); - } else if (Conf['Loop in New Tab'] && (video = $('video'))) { - video.loop = true; - video.controls = false; - video.play(); - return ImageCommon.addControls(video); + } else if (video = $('video')) { + if (Conf['Volume in New Tab']) { + Volume.setup(video); + } + if (Conf['Loop in New Tab']) { + video.loop = true; + video.controls = false; + video.play(); + return ImageCommon.addControls(video); + } } }); return; diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index c8d3a9464..5f6663f60 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 00380b68d..169655118 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 5738711a7..1c66d0817 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index e6f7bc13e..80f9d35d0 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.2", + "version": "1.9.22.3", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",