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

Revert "Fix updating the context of threads and index"

Browse Source 
This reverts commit e7b1c52dbf9f25aec32bea64c712ee4075f7ef6f.
This commit is contained in:
Zixaphir 2014-01-18 14:11:36 -07:00
parent e7b1c52dbf
commit b0ca427207
4 changed files with 35 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2715,20 +2715,19 @@
Main.callbackNodes(Post, posts);
return $.event('IndexRefresh');
},
buildReplies: function(threads) {
var errors, posts;
buildReplies: function(threadRoots) {
var data, err, errors, i, lastReplies, node, nodes, post, posts, thread, threadRoot, _i, _j, _len, _len1;
posts = [];
errors = null;
threads.forEach(function(thread) {
var data, err, i, lastReplies, node, nodes, post, threadRoot, _i, _len;
threadRoot = thread.OP.nodes.root.parentElement;
for (_i = 0, _len = threadRoots.length; _i < _len; _i++) {
threadRoot = threadRoots[_i];
thread = Get.threadFromRoot(threadRoot);
i = Index.liveThreadIDs.indexOf(thread.ID);
if (!(lastReplies = Index.liveThreadData[i].last_replies)) {
return;
continue;
}
nodes = [];
for (_i = 0, _len = lastReplies.length; _i < _len; _i++) {
data = lastReplies[_i];
for (_j = 0, _len1 = lastReplies.length; _j < _len1; _j++) {
data = lastReplies[_j];
if (post = thread.posts[data.no]) {
nodes.push(post.nodes.root);
continue;
@ -2747,8 +2746,8 @@
});
}
}
return $.add(threadRoot, nodes);
});
$.add(threadRoot, nodes);
}
if (errors) {
Main.handleErrors(errors);
}
@ -2853,7 +2852,7 @@
$.rmAll(Index.root);
$.rmAll(Header.hover);
if (Conf['Show Replies']) {
Index.buildReplies(g.BOARD.threads);
Index.buildReplies(nodes);
}
return Index.buildStructure(nodes);
},
@ -12294,11 +12293,9 @@
pageNum = view;
view = 'index';
}
if (view === g.VIEW && boardID === g.BOARD.ID) {
Navigate.updateContext(view);
} else {
Navigate.updateContext(view);
if (!(view === g.VIEW && boardID === g.BOARD.ID)) {
Navigate.disconnect();
Navigate.updateContext(view);
Navigate.clean();
Navigate.reconnect();
}

29
builds/crx/script.js
View File

@ -2725,20 +2725,19 @@
Main.callbackNodes(Post, posts);
return $.event('IndexRefresh');
},
buildReplies: function(threads) {
var errors, posts;
buildReplies: function(threadRoots) {
var data, err, errors, i, lastReplies, node, nodes, post, posts, thread, threadRoot, _i, _j, _len, _len1;
posts = [];
errors = null;
threads.forEach(function(thread) {
var data, err, i, lastReplies, node, nodes, post, threadRoot, _i, _len;
threadRoot = thread.OP.nodes.root.parentElement;
for (_i = 0, _len = threadRoots.length; _i < _len; _i++) {
threadRoot = threadRoots[_i];
thread = Get.threadFromRoot(threadRoot);
i = Index.liveThreadIDs.indexOf(thread.ID);
if (!(lastReplies = Index.liveThreadData[i].last_replies)) {
return;
continue;
}
nodes = [];
for (_i = 0, _len = lastReplies.length; _i < _len; _i++) {
data = lastReplies[_i];
for (_j = 0, _len1 = lastReplies.length; _j < _len1; _j++) {
data = lastReplies[_j];
if (post = thread.posts[data.no]) {
nodes.push(post.nodes.root);
continue;
@ -2757,8 +2756,8 @@
});
}
}
return $.add(threadRoot, nodes);
});
$.add(threadRoot, nodes);
}
if (errors) {
Main.handleErrors(errors);
}
@ -2863,7 +2862,7 @@
$.rmAll(Index.root);
$.rmAll(Header.hover);
if (Conf['Show Replies']) {
Index.buildReplies(g.BOARD.threads);
Index.buildReplies(nodes);
}
return Index.buildStructure(nodes);
},
@ -12283,11 +12282,9 @@
pageNum = view;
view = 'index';
}
if (view === g.VIEW && boardID === g.BOARD.ID) {
Navigate.updateContext(view);
} else {
Navigate.updateContext(view);
if (!(view === g.VIEW && boardID === g.BOARD.ID)) {
Navigate.disconnect();
Navigate.updateContext(view);
Navigate.clean();
Navigate.reconnect();
}

13
src/General/Index.coffee
View File

@ -349,13 +349,12 @@ Index =
Main.callbackNodes Post, posts
$.event 'IndexRefresh'
buildReplies: (threads) ->
posts = []
errors = null
threads.forEach (thread) ->
threadRoot = thread.OP.nodes.root.parentElement
buildReplies: (threadRoots) ->
posts = []
for threadRoot in threadRoots
thread = Get.threadFromRoot threadRoot
i = Index.liveThreadIDs.indexOf thread.ID
return unless lastReplies = Index.liveThreadData[i].last_replies
continue unless lastReplies = Index.liveThreadData[i].last_replies
nodes = []
for data in lastReplies
if post = thread.posts[data.no]
@ -437,7 +436,7 @@ Index =
nodes.push target.data
$.rmAll Index.root
$.rmAll Header.hover
Index.buildReplies g.BOARD.threads if Conf['Show Replies']
Index.buildReplies nodes if Conf['Show Replies']
Index.buildStructure nodes
buildSinglePage: (pageNum) ->

7
src/General/Navigate.coffee
View File

@ -204,11 +204,10 @@ Navigate =
pageNum = view
view = 'index' # path is "/boardID/". See the problem?
if view is g.VIEW and boardID is g.BOARD.ID
Navigate.updateContext view
else # We've navigated somewhere we weren't before!
Navigate.updateContext view
unless view is g.VIEW and boardID is g.BOARD.ID # We've navigated somewhere we weren't before!
Navigate.disconnect()
Navigate.updateContext view
Navigate.clean()
Navigate.reconnect()