Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bstable'

Browse Source
This commit is contained in:
ccd0 2015-02-02 00:11:18 -08:00
commit 7ab7b178ff
17 changed files with 56 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -3,6 +3,11 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
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.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")]

2
LICENSE
View File

@ -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

BIN
builds/4chan-X-beta.crx
View File

Binary file not shown.

2
builds/4chan-X-beta.meta.js
View File

@ -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

24
builds/4chan-X-beta.user.js
View File

@ -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) {

BIN
builds/4chan-X-noupdate.crx
View File

Binary file not shown.

24
builds/4chan-X-noupdate.user.js
View File

@ -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) {

BIN
builds/4chan-X.crx
View File

Binary file not shown.

2
builds/4chan-X.meta.js
View File

@ -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

24
builds/4chan-X.user.js
View File

@ -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) {

BIN
builds/4chan-X.zip
View File

Binary file not shown.

2
builds/updates-beta.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.9.22.5' />
<updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.9.22.6' />
</app>
</gupdate>

2
builds/updates.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.9.22.5' />
<updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.9.22.6' />
</app>
</gupdate>

2
package.json
View File

@ -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/",

2
src/General/Config.coffee
View File

@ -182,12 +182,10 @@ Config =
'Image Hover in Catalog': [
false
'Show full image / video on mouseover in <%= meta.name %> catalog.'
1
]
'Mouse Wheel Volume': [
true
'Adjust volume of hovering videos with mouse wheel.'
1
]
'Gallery': [
true

11
src/Images/ImageHover.coffee
View File

@ -1,11 +1,10 @@
ImageHover =
init: ->
return unless Conf['Image Hover'] and g.VIEW in ['index', 'thread']
Post.callbacks.push
name: 'Image Hover'
cb: @node
return if g.VIEW not in ['index', 'thread']
if Conf['Image Hover']
Post.callbacks.push
name: 'Image Hover'
cb: @node
if Conf['Image Hover in Catalog']
CatalogThread.callbacks.push
name: 'Image Hover'

2
src/Images/Volume.coffee
View File

@ -1,7 +1,7 @@
Volume =
init: ->
return unless g.VIEW in ['index', 'thread'] and
(Conf['Image Expansion'] or Conf['Image Hover'] or Conf['Gallery'])
(Conf['Image Expansion'] or Conf['Image Hover'] or Conf['Image Hover in Catalog'] or Conf['Gallery'])
$.sync 'Allow Sound', (x) ->
Conf['Allow Sound'] = x