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-08 12:34:49 -08:00
commit d59ddccf3f
15 changed files with 32 additions and 27 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.8
*2015-02-08* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.23.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.23.8/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix thread watcher checking dead threads on every update.
### 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")]

2
LICENSE
View File

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

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

@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X beta
// @version 1.9.23.7
// @version 1.9.23.8
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -25,7 +25,7 @@
// ==/UserScript==
/*
* 4chan X - Version 1.9.23.7
* 4chan X - Version 1.9.23.8
*
* 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.7',
VERSION: '1.9.23.8',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@ -12515,10 +12515,10 @@
ThreadWatcher.fetchStatus(thread);
}
},
fetchStatus: function(thread) {
fetchStatus: function(thread, force) {
var boardID, data, fetchCount, threadID;
boardID = thread.boardID, threadID = thread.threadID, data = thread.data;
if (data.isDead && !Conf['Show Unread Count']) {
if (data.isDead && !force) {
return;
}
fetchCount = ThreadWatcher.fetchCount;
@ -12819,7 +12819,7 @@
boardID: boardID,
threadID: threadID,
data: data
});
}, true);
}
},
rm: function(boardID, threadID) {

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

Binary file not shown.

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

@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
// @version 1.9.23.7
// @version 1.9.23.8
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -24,7 +24,7 @@
// ==/UserScript==
/*
* 4chan X - Version 1.9.23.7
* 4chan X - Version 1.9.23.8
*
* 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.7',
VERSION: '1.9.23.8',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@ -12514,10 +12514,10 @@
ThreadWatcher.fetchStatus(thread);
}
},
fetchStatus: function(thread) {
fetchStatus: function(thread, force) {
var boardID, data, fetchCount, threadID;
boardID = thread.boardID, threadID = thread.threadID, data = thread.data;
if (data.isDead && !Conf['Show Unread Count']) {
if (data.isDead && !force) {
return;
}
fetchCount = ThreadWatcher.fetchCount;
@ -12818,7 +12818,7 @@
boardID: boardID,
threadID: threadID,
data: data
});
}, true);
}
},
rm: function(boardID, threadID) {

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

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

@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
// @version 1.9.23.7
// @version 1.9.23.8
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -25,7 +25,7 @@
// ==/UserScript==
/*
* 4chan X - Version 1.9.23.7
* 4chan X - Version 1.9.23.8
*
* 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.7',
VERSION: '1.9.23.8',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@ -12515,10 +12515,10 @@
ThreadWatcher.fetchStatus(thread);
}
},
fetchStatus: function(thread) {
fetchStatus: function(thread, force) {
var boardID, data, fetchCount, threadID;
boardID = thread.boardID, threadID = thread.threadID, data = thread.data;
if (data.isDead && !Conf['Show Unread Count']) {
if (data.isDead && !force) {
return;
}
fetchCount = ThreadWatcher.fetchCount;
@ -12819,7 +12819,7 @@
boardID: boardID,
threadID: threadID,
data: data
});
}, true);
}
},
rm: function(boardID, threadID) {

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

6
src/Monitoring/ThreadWatcher.coffee
View File

@ -170,9 +170,9 @@ ThreadWatcher =
ThreadWatcher.fetchStatus thread
return
fetchStatus: (thread) ->
fetchStatus: (thread, force) ->
{boardID, threadID, data} = thread
return if data.isDead and !Conf['Show Unread Count']
return if data.isDead and not force
{fetchCount} = ThreadWatcher
if fetchCount.fetching is 0
ThreadWatcher.status.textContent = '...'
@ -356,7 +356,7 @@ ThreadWatcher =
ThreadWatcher.db.set {boardID, threadID, val: data}
ThreadWatcher.refresh()
if Conf['Show Unread Count']
ThreadWatcher.fetchStatus {boardID, threadID, data}
ThreadWatcher.fetchStatus {boardID, threadID, data}, true
rm: (boardID, threadID) ->
ThreadWatcher.db.delete {boardID, threadID}