Fix a small navigation error

This commit is contained in:
Zixaphir 2015-01-13 12:09:15 -07:00
parent cc9cfd9467
commit daa3f9d2cc
4 changed files with 9 additions and 8 deletions

View File

@ -4793,7 +4793,7 @@
if (!(/^p\d+$/.test(hash) && (post = $.id(hash)))) {
return;
}
if ((Get.postFromRoot(post)).isHidden) {
if (!(post = Get.postFromRoot(post)) || post.isHidden) {
return;
}
return Header.scrollTo(post);
@ -18864,11 +18864,11 @@
$.rmAll(board);
$.add(board, [threadRoot, $.el('hr')]);
QR.generatePostableThreadsList();
Header.hashScroll.call(window);
if (errors) {
Main.handleErrors(errors);
}
return $.event('4chanXInitFinished');
$.event('4chanXInitFinished');
return Header.hashScroll.call(window);
},
pushState: function(path) {
history.pushState(null, '', path);

View File

@ -4811,7 +4811,7 @@
if (!(/^p\d+$/.test(hash) && (post = $.id(hash)))) {
return;
}
if ((Get.postFromRoot(post)).isHidden) {
if (!(post = Get.postFromRoot(post)) || post.isHidden) {
return;
}
return Header.scrollTo(post);
@ -18890,11 +18890,11 @@
$.rmAll(board);
$.add(board, [threadRoot, $.el('hr')]);
QR.generatePostableThreadsList();
Header.hashScroll.call(window);
if (errors) {
Main.handleErrors(errors);
}
return $.event('4chanXInitFinished');
$.event('4chanXInitFinished');
return Header.hashScroll.call(window);
},
pushState: function(path) {
history.pushState(null, '', path);

View File

@ -354,7 +354,7 @@ Header =
hashScroll: ->
hash = @location.hash[1..]
return unless /^p\d+$/.test(hash) and post = $.id hash
return if (Get.postFromRoot post).isHidden
return if !(post = Get.postFromRoot post) or post.isHidden
Header.scrollTo post
scrollTo: (root, down, needed) ->

View File

@ -354,13 +354,14 @@ Navigate =
$.add board, [threadRoot, $.el 'hr']
QR.generatePostableThreadsList()
Header.hashScroll.call window
Main.handleErrors errors if errors
# Thrown after thread has been generated and features have been parsed, like 4chan X
$.event '4chanXInitFinished'
Header.hashScroll.call window
pushState: (path) ->
history.pushState null, '', path
Navigate.path = window.location.pathname