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

Fix JSON Navigation unread count

Browse Source
This commit is contained in:
Zixaphir 2014-02-16 03:11:27 -07:00
parent 32b020c701
commit b3f937f5c8
4 changed files with 38 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10024,13 +10024,13 @@
ready: function() {
var posts;
$.off(d, '4chanXInitFinished', Unread.ready);
posts = [];
Unread.thread.posts.forEach(function(post) {
if (post.isReply) {
return posts.push(post);
}
});
if (!Conf['Quote Threading']) {
posts = [];
Unread.thread.posts.forEach(function(post) {
if (post.isReply) {
return posts.push(post);
}
});
Unread.addPosts(posts);
}
if (Conf['Quote Threading']) {
@ -10101,9 +10101,7 @@
})) {
continue;
}
if (!(post.prev || post.next)) {
Unread.posts.push(post);
}
Unread.posts.push(post);
Unread.addPostQuotingYou(post);
}
if (Conf['Unread Line']) {
@ -10148,7 +10146,7 @@
onUpdate: function(e) {
if (e.detail[404]) {
return Unread.update();
} else {
} else if (!Conf['Quote Threading']) {
return Unread.addPosts(e.detail.newPosts);
}
},
@ -12296,11 +12294,11 @@
},
updateContext: function(view) {
var oldView;
if (view === g.VIEW) {
return;
g.DEAD = false;
if (view !== g.VIEW) {
$.rmClass(doc, g.VIEW);
$.addClass(doc, view);
}
$.rmClass(doc, g.VIEW);
$.addClass(doc, view);
oldView = g.VIEW;
g.VIEW = view;
return {
@ -12532,7 +12530,6 @@
Main.callbackNodes(Thread, [thread]);
Main.callbackNodes(Post, posts);
Navigate.ready('Quote Threading', QuoteThreading.force, Conf['Quote Threading'] && !Conf['Unread Count']);
Navigate.ready('Unread Count', Unread.ready, Conf['Unread Count']);
Navigate.buildThread();
return Header.hashScroll.call(window);
},
@ -12542,8 +12539,7 @@
$.rmAll(board);
$.add(board, [Navigate.threadRoot, $.el('hr')]);
if (Conf['Unread Count']) {
Unread.read();
return Unread.update();
return Navigate.ready('Unread Count', Unread.ready, Conf['Unread Count']);
}
},
popstate: function() {

30
builds/crx/script.js
View File

@ -10015,13 +10015,13 @@
ready: function() {
var posts;
$.off(d, '4chanXInitFinished', Unread.ready);
posts = [];
Unread.thread.posts.forEach(function(post) {
if (post.isReply) {
return posts.push(post);
}
});
if (!Conf['Quote Threading']) {
posts = [];
Unread.thread.posts.forEach(function(post) {
if (post.isReply) {
return posts.push(post);
}
});
Unread.addPosts(posts);
}
if (Conf['Quote Threading']) {
@ -10092,9 +10092,7 @@
})) {
continue;
}
if (!(post.prev || post.next)) {
Unread.posts.push(post);
}
Unread.posts.push(post);
Unread.addPostQuotingYou(post);
}
if (Conf['Unread Line']) {
@ -10139,7 +10137,7 @@
onUpdate: function(e) {
if (e.detail[404]) {
return Unread.update();
} else {
} else if (!Conf['Quote Threading']) {
return Unread.addPosts(e.detail.newPosts);
}
},
@ -12293,11 +12291,11 @@
},
updateContext: function(view) {
var oldView;
if (view === g.VIEW) {
return;
g.DEAD = false;
if (view !== g.VIEW) {
$.rmClass(doc, g.VIEW);
$.addClass(doc, view);
}
$.rmClass(doc, g.VIEW);
$.addClass(doc, view);
oldView = g.VIEW;
g.VIEW = view;
return {
@ -12529,7 +12527,6 @@
Main.callbackNodes(Thread, [thread]);
Main.callbackNodes(Post, posts);
Navigate.ready('Quote Threading', QuoteThreading.force, Conf['Quote Threading'] && !Conf['Unread Count']);
Navigate.ready('Unread Count', Unread.ready, Conf['Unread Count']);
Navigate.buildThread();
return Header.hashScroll.call(window);
},
@ -12539,8 +12536,7 @@
$.rmAll(board);
$.add(board, [Navigate.threadRoot, $.el('hr')]);
if (Conf['Unread Count']) {
Unread.read();
return Unread.update();
return Navigate.ready('Unread Count', Unread.ready, Conf['Unread Count']);
}
},
popstate: function() {

12
src/General/Navigate.coffee
View File

@ -86,10 +86,12 @@ Navigate =
QR.generatePostableThreadsList()
updateContext: (view) ->
return if view is g.VIEW
g.DEAD = false
unless view is g.VIEW
$.rmClass doc, g.VIEW
$.addClass doc, view
$.rmClass doc, g.VIEW
$.addClass doc, view
oldView = g.VIEW
g.VIEW = view
{
@ -287,7 +289,6 @@ Navigate =
Main.callbackNodes Post, posts
Navigate.ready 'Quote Threading', QuoteThreading.force, Conf['Quote Threading'] and not Conf['Unread Count']
Navigate.ready 'Unread Count', Unread.ready, Conf['Unread Count']
Navigate.buildThread()
Header.hashScroll.call window
@ -298,8 +299,7 @@ Navigate =
$.add board, [Navigate.threadRoot, $.el 'hr']
if Conf['Unread Count']
Unread.read()
Unread.update()
Navigate.ready 'Unread Count', Unread.ready, Conf['Unread Count']
popstate: ->
return if window.location.pathname is Navigate.path

11
src/Monitoring/Unread.coffee
View File

@ -41,9 +41,10 @@ Unread =
ready: ->
$.off d, '4chanXInitFinished', Unread.ready
posts = []
Unread.thread.posts.forEach (post) -> posts.push post if post.isReply
Unread.addPosts posts unless Conf['Quote Threading']
unless Conf['Quote Threading']
posts = []
Unread.thread.posts.forEach (post) -> posts.push post if post.isReply
Unread.addPosts posts
QuoteThreading.force() if Conf['Quote Threading']
Unread.scroll() if Conf['Scroll to Last Read Post']
@ -91,7 +92,7 @@ Unread =
threadID: post.thread.ID
postID: ID
}
Unread.posts.push post unless post.prev or post.next
Unread.posts.push post
Unread.addPostQuotingYou post
if Conf['Unread Line']
# Force line on visible threads if there were no unread posts previously.
@ -125,7 +126,7 @@ Unread =
onUpdate: (e) ->
if e.detail[404]
Unread.update()
else
else if !Conf['Quote Threading']
Unread.addPosts e.detail.newPosts
readSinglePost: (post) ->