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

Merge branch 'v3'

Browse Source 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-01-07 10:50:03 -07:00
commit 87d1f7b454
3 changed files with 15 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builds/appchan-x.user.js
View File

@ -11791,17 +11791,6 @@
}); });
this.posts = new RandomAccessList; this.posts = new RandomAccessList;
this.postsQuotingYou = []; this.postsQuotingYou = [];
this.qr = QR.db ? function(post) {
var data;
data = {
boardID: post.board.ID,
threadID: post.thread.ID,
postID: post.ID
};
return (QR.db.get(data) ? true : false);
} : function() {
return false;
};
return Thread.callbacks.push({ return Thread.callbacks.push({
name: 'Unread', name: 'Unread',
cb: this.node cb: this.node
@ -11894,7 +11883,11 @@
for (_i = 0, _len = posts.length; _i < _len; _i++) { for (_i = 0, _len = posts.length; _i < _len; _i++) {
post = posts[_i]; post = posts[_i];
ID = post.ID; ID = post.ID;
if (ID <= Unread.lastReadPost || post.isHidden || Unread.qr(post)) { if (ID <= Unread.lastReadPost || post.isHidden || QR.db.get({
boardID: post.board.ID,
threadID: post.thread.ID,
postID: post.ID
})) {
continue; continue;
} }
if (!(post.prev || post.next)) { if (!(post.prev || post.next)) {

17
builds/crx/script.js
View File

@ -11775,17 +11775,6 @@
}); });
this.posts = new RandomAccessList; this.posts = new RandomAccessList;
this.postsQuotingYou = []; this.postsQuotingYou = [];
this.qr = QR.db ? function(post) {
var data;
data = {
boardID: post.board.ID,
threadID: post.thread.ID,
postID: post.ID
};
return (QR.db.get(data) ? true : false);
} : function() {
return false;
};
return Thread.callbacks.push({ return Thread.callbacks.push({
name: 'Unread', name: 'Unread',
cb: this.node cb: this.node
@ -11878,7 +11867,11 @@
for (_i = 0, _len = posts.length; _i < _len; _i++) { for (_i = 0, _len = posts.length; _i < _len; _i++) {
post = posts[_i]; post = posts[_i];
ID = post.ID; ID = post.ID;
if (ID <= Unread.lastReadPost || post.isHidden || Unread.qr(post)) { if (ID <= Unread.lastReadPost || post.isHidden || QR.db.get({
boardID: post.board.ID,
threadID: post.thread.ID,
postID: post.ID
})) {
continue; continue;
} }
if (!(post.prev || post.next)) { if (!(post.prev || post.next)) {

16
src/Monitoring/Unread.coffee
View File

@ -8,16 +8,6 @@ Unread =
@posts = new RandomAccessList @posts = new RandomAccessList
@postsQuotingYou = [] @postsQuotingYou = []
@qr = if QR.db
(post) ->
data =
boardID: post.board.ID
threadID: post.thread.ID
postID: post.ID
return (if QR.db.get data then true else false)
else ->
return false
Thread.callbacks.push Thread.callbacks.push
name: 'Unread' name: 'Unread'
cb: @node cb: @node
@ -80,7 +70,11 @@ Unread =
addPosts: (posts) -> addPosts: (posts) ->
for post in posts for post in posts
{ID} = post {ID} = post
continue if ID <= Unread.lastReadPost or post.isHidden or Unread.qr post continue if ID <= Unread.lastReadPost or post.isHidden or QR.db.get {
boardID: post.board.ID
threadID: post.thread.ID
postID: post.ID
}
Unread.posts.push post unless post.prev or post.next Unread.posts.push post unless post.prev or post.next
Unread.addPostQuotingYou post Unread.addPostQuotingYou post
if Conf['Unread Line'] if Conf['Unread Line']