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

Merge branch 'bstable'

Browse Source 
Conflicts:
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
This commit is contained in:
ccd0 2015-02-26 22:18:35 -08:00
commit 56918627a2
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -25,6 +25,9 @@ The links to individual versions below are to copies of the script with the upda
### v1.10.1 ### v1.10.1
**v1.10.1.16** *(2015-02-26)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.16/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.16/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix thread watcher data corruption issue.
**v1.10.1.15** *(2015-02-23)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.15/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.15/builds/4chan-X-noupdate.crx "Chromium version")] **v1.10.1.15** *(2015-02-23)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.15/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.15/builds/4chan-X-noupdate.crx "Chromium version")]
- (VoH) Restore Nyafuu archive. - (VoH) Restore Nyafuu archive.

6
src/General/lib/databoard.class
View File

@ -50,8 +50,8 @@ class DataBoard
get: ({boardID, threadID, postID, defaultValue}) -> get: ({boardID, threadID, postID, defaultValue}) ->
if board = @data.boards[boardID] if board = @data.boards[boardID]
unless threadID unless threadID?
if postID if postID?
for ID, thread in board for ID, thread in board
if postID of thread if postID of thread
val = thread[postID] val = thread[postID]
@ -59,7 +59,7 @@ class DataBoard
else else
val = board val = board
else if thread = board[threadID] else if thread = board[threadID]
val = if postID val = if postID?
thread[postID] thread[postID]
else else
thread thread

6
src/Monitoring/ThreadWatcher.coffee
View File

@ -134,8 +134,8 @@ ThreadWatcher =
{db} = ThreadWatcher {db} = ThreadWatcher
boardID = g.BOARD.ID boardID = g.BOARD.ID
db.forceSync() db.forceSync()
for threadID, data of db.data.boards[boardID] when not data.isDead and threadID not of g.BOARD.threads for threadID, data of db.data.boards[boardID] when not data?.isDead and threadID not of g.BOARD.threads
if Conf['Auto Prune'] if Conf['Auto Prune'] or not (data and typeof data is 'object')
ThreadWatcher.db.delete {boardID, threadID} ThreadWatcher.db.delete {boardID, threadID}
else else
data.isDead = true data.isDead = true
@ -248,7 +248,7 @@ ThreadWatcher =
for boardID, threads of ThreadWatcher.db.data.boards for boardID, threads of ThreadWatcher.db.data.boards
if Conf['Current Board'] and boardID isnt g.BOARD.ID if Conf['Current Board'] and boardID isnt g.BOARD.ID
continue continue
for threadID, data of threads for threadID, data of threads when data and typeof data is 'object'
all.push {boardID, threadID, data} all.push {boardID, threadID, data}
all all