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

Fix an endless recursion loop

Browse Source
This commit is contained in:
Zixaphir 2014-04-06 21:20:58 -07:00
parent 824f4d3e78
commit 46f29fd094
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3119,6 +3119,7 @@
setPage: function(pageNum) { setPage: function(pageNum) {
var a, href, maxPageNum, next, pagesRoot, prev, strong; var a, href, maxPageNum, next, pagesRoot, prev, strong;
pageNum || (pageNum = Index.getCurrentPage()); pageNum || (pageNum = Index.getCurrentPage());
Index.pageNum = pageNum;
maxPageNum = Index.getMaxPageNum(); maxPageNum = Index.getMaxPageNum();
pagesRoot = $('.pages', Index.pagelist); pagesRoot = $('.pages', Index.pagelist);
prev = pagesRoot.previousSibling.firstChild; prev = pagesRoot.previousSibling.firstChild;
@ -3501,6 +3502,9 @@
case 'paged': case 'paged':
case 'infinite': case 'infinite':
pageNum = Index.getCurrentPage(); pageNum = Index.getCurrentPage();
if (Index.isSearching) {
Index.setPage(pageNum = 0);
}
if (pageNum > Index.getMaxPageNum()) { if (pageNum > Index.getMaxPageNum()) {
Index.pageNav(Index.getMaxPageNum()); Index.pageNav(Index.getMaxPageNum());
return; return;

4
builds/crx/script.js
View File

@ -3180,6 +3180,7 @@
setPage: function(pageNum) { setPage: function(pageNum) {
var a, href, maxPageNum, next, pagesRoot, prev, strong; var a, href, maxPageNum, next, pagesRoot, prev, strong;
pageNum || (pageNum = Index.getCurrentPage()); pageNum || (pageNum = Index.getCurrentPage());
Index.pageNum = pageNum;
maxPageNum = Index.getMaxPageNum(); maxPageNum = Index.getMaxPageNum();
pagesRoot = $('.pages', Index.pagelist); pagesRoot = $('.pages', Index.pagelist);
prev = pagesRoot.previousSibling.firstChild; prev = pagesRoot.previousSibling.firstChild;
@ -3562,6 +3563,9 @@
case 'paged': case 'paged':
case 'infinite': case 'infinite':
pageNum = Index.getCurrentPage(); pageNum = Index.getCurrentPage();
if (Index.isSearching) {
Index.setPage(pageNum = 0);
}
if (pageNum > Index.getMaxPageNum()) { if (pageNum > Index.getMaxPageNum()) {
Index.pageNav(Index.getMaxPageNum()); Index.pageNav(Index.getMaxPageNum());
return; return;

3
src/General/Index.coffee
View File

@ -451,6 +451,7 @@ Index =
setPage: (pageNum) -> setPage: (pageNum) ->
pageNum or= Index.getCurrentPage() pageNum or= Index.getCurrentPage()
Index.pageNum = pageNum
maxPageNum = Index.getMaxPageNum() maxPageNum = Index.getMaxPageNum()
pagesRoot = $ '.pages', Index.pagelist pagesRoot = $ '.pages', Index.pagelist
# Previous/Next buttons # Previous/Next buttons
@ -739,6 +740,8 @@ Index =
switch Conf['Index Mode'] switch Conf['Index Mode']
when 'paged', 'infinite' when 'paged', 'infinite'
pageNum = Index.getCurrentPage() pageNum = Index.getCurrentPage()
if Index.isSearching
Index.setPage pageNum = 0
if pageNum > Index.getMaxPageNum() if pageNum > Index.getMaxPageNum()
# Go to the last available page if we were past the limit. # Go to the last available page if we were past the limit.
Index.pageNav Index.getMaxPageNum() Index.pageNav Index.getMaxPageNum()