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

Fix a small navigation error

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
builds/crx/script.js
View File

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

2
src/General/Header.coffee
View File

@ -354,7 +354,7 @@ Header =
hashScroll: -> hashScroll: ->
hash = @location.hash[1..] hash = @location.hash[1..]
return unless /^p\d+$/.test(hash) and post = $.id hash 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 Header.scrollTo post
scrollTo: (root, down, needed) -> scrollTo: (root, down, needed) ->

3
src/General/Navigate.coffee
View File

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