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

Merge branch 'master' into page1

Browse Source 
Conflicts:
	src/General/Index.coffee
	src/Monitoring/ThreadStats.coffee
This commit is contained in:
ccd0 2014-04-12 20:39:12 -07:00
commit bb08d503a9
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/General/Index.coffee
View File

@ -167,10 +167,8 @@ Index =
if Conf['Refreshed Navigation'] and Conf['Index Mode'] isnt 'all pages' if Conf['Refreshed Navigation'] and Conf['Index Mode'] isnt 'all pages'
Index.update pageNum Index.update pageNum
else else
Index.pageNav pageNum return if Index.currentPage is pageNum
pageNav: (pageNum) -> Index.pageLoad pageNum
return if Index.currentPage is pageNum
Index.pageLoad pageNum
pageLoad: (pageNum) -> pageLoad: (pageNum) ->
Index.currentPage = pageNum Index.currentPage = pageNum
return if Conf['Index Mode'] is 'all pages' return if Conf['Index Mode'] is 'all pages'
@ -281,7 +279,7 @@ Index =
if req.status is 200 if req.status is 200
Index.parse req.response, pageNum Index.parse req.response, pageNum
else if req.status is 304 and pageNum? else if req.status is 304 and pageNum?
Index.pageNav pageNum Index.pageLoad pageNum
catch err catch err
c.error "Index failure: #{err.message}", err.stack c.error "Index failure: #{err.message}", err.stack
# network error or non-JSON content for example. # network error or non-JSON content for example.
@ -304,7 +302,7 @@ Index =
Index.sort() Index.sort()
Index.buildPagelist() Index.buildPagelist()
if pageNum? if pageNum?
Index.pageNav pageNum Index.pageLoad pageNum
return return
Index.buildIndex() Index.buildIndex()
Index.setPage() Index.setPage()
@ -493,7 +491,7 @@ Index =
Index.setPage() Index.setPage()
else else
Navigate.pushState if pageNum is 1 then './' else pageNum Navigate.pushState if pageNum is 1 then './' else pageNum
Index.pageNav pageNum Index.pageLoad pageNum
querySearch: (query) -> querySearch: (query) ->
return unless keywords = query.toLowerCase().match /\S+/g return unless keywords = query.toLowerCase().match /\S+/g

1
src/General/Navigate.coffee
View File

@ -39,6 +39,7 @@ Navigate =
QuoteBacklink.containers = {} QuoteBacklink.containers = {}
$.rmAll $('.board') $.rmAll $('.board')
Index.pagelist.hidden = true
features: [ features: [
['Thread Excerpt', ThreadExcerpt] ['Thread Excerpt', ThreadExcerpt]

3
src/Monitoring/ThreadStats.coffee
View File

@ -40,7 +40,7 @@ ThreadStats =
if Conf['Updater and Stats in Header'] if Conf['Updater and Stats in Header']
Header.rmShortcut @dialog Header.rmShortcut @dialog
else else
$.rm d.body, sc $.rm @dialog
clearTimeout @timeout # a possible race condition might be that this won't clear in time, but the resulting error will prevent issues anyways. clearTimeout @timeout # a possible race condition might be that this won't clear in time, but the resulting error will prevent issues anyways.
@ -49,6 +49,7 @@ ThreadStats =
delete @postCountEl delete @postCountEl
delete @fileCountEl delete @fileCountEl
delete @pageCountEl delete @pageCountEl
delete @dialog
Thread.callbacks.disconnect 'Thread Stats' Thread.callbacks.disconnect 'Thread Stats'
$.off d, 'ThreadUpdate', ThreadStats.onUpdate $.off d, 'ThreadUpdate', ThreadStats.onUpdate