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

Merge branch 'master' into zixaphir-merge

Browse Source
This commit is contained in:
ccd0 2015-02-06 19:22:37 -08:00
commit 7a9546949d
15 changed files with 27 additions and 22 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.23.x -->
### v1.9.23.7
*2015-02-06* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.23.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.23.7/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix bug in gallery handling of deleted images (introduced in v1.9.22.0).
### v1.9.23.6
*2015-02-04* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.23.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.23.6/builds/4chan-X-noupdate.crx "Chromium version")]

2
LICENSE
View File

@ -1,5 +1,5 @@
/*
* 4chan X - Version 1.9.23.6
* 4chan X - Version 1.9.23.7
*
* 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.23.6
// @version 1.9.23.7
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X

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

@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X beta
// @version 1.9.23.6
// @version 1.9.23.7
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -25,7 +25,7 @@
// ==/UserScript==
/*
* 4chan X - Version 1.9.23.6
* 4chan X - Version 1.9.23.7
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@ -402,7 +402,7 @@
doc = d.documentElement;
g = {
VERSION: '1.9.23.6',
VERSION: '1.9.23.7',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@ -9012,10 +9012,10 @@
_ref2 = $$('.post .file');
for (_j = 0, _len1 = _ref2.length; _j < _len1; _j++) {
file = _ref2[_j];
post = Get.postFromNode(file);
if (!post.file || post.file.isDead) {
if (!(!$('.fileDeletedRes, .fileDeleted', file))) {
continue;
}
post = Get.postFromNode(file);
Gallery.generateThumb(post);
if (!image && Gallery.fullIDs[post.fullID]) {
candidate = post.file.thumb.parentNode;

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

Binary file not shown.

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

@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
// @version 1.9.23.6
// @version 1.9.23.7
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -24,7 +24,7 @@
// ==/UserScript==
/*
* 4chan X - Version 1.9.23.6
* 4chan X - Version 1.9.23.7
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@ -401,7 +401,7 @@
doc = d.documentElement;
g = {
VERSION: '1.9.23.6',
VERSION: '1.9.23.7',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@ -9011,10 +9011,10 @@
_ref2 = $$('.post .file');
for (_j = 0, _len1 = _ref2.length; _j < _len1; _j++) {
file = _ref2[_j];
post = Get.postFromNode(file);
if (!post.file || post.file.isDead) {
if (!(!$('.fileDeletedRes, .fileDeleted', file))) {
continue;
}
post = Get.postFromNode(file);
Gallery.generateThumb(post);
if (!image && Gallery.fullIDs[post.fullID]) {
candidate = post.file.thumb.parentNode;

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.23.6
// @version 1.9.23.7
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X

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

@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
// @version 1.9.23.6
// @version 1.9.23.7
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -25,7 +25,7 @@
// ==/UserScript==
/*
* 4chan X - Version 1.9.23.6
* 4chan X - Version 1.9.23.7
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@ -402,7 +402,7 @@
doc = d.documentElement;
g = {
VERSION: '1.9.23.6',
VERSION: '1.9.23.7',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@ -9012,10 +9012,10 @@
_ref2 = $$('.post .file');
for (_j = 0, _len1 = _ref2.length; _j < _len1; _j++) {
file = _ref2[_j];
post = Get.postFromNode(file);
if (!post.file || post.file.isDead) {
if (!(!$('.fileDeletedRes, .fileDeleted', file))) {
continue;
}
post = Get.postFromNode(file);
Gallery.generateThumb(post);
if (!image && Gallery.fullIDs[post.fullID]) {
candidate = post.file.thumb.parentNode;

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.23.6' />
<updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.9.23.7' />
</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.23.6' />
<updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.9.23.7' />
</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.23.6",
"version": "1.9.23.7",
"repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/",

2
src/Images/Gallery.coffee
View File

@ -81,7 +81,7 @@ Gallery =
for file in $$ '.post .file'
post = Get.postFromNode file
continue if !post.file or post.file.isDead
continue unless post.file
Gallery.generateThumb post
# If no image to open is given, pick image we have scrolled to.
if !image and Gallery.fullIDs[post.fullID]