Merge branch 'master' into page1

Conflicts:
	src/General/Index.coffee
	src/Monitoring/ThreadStats.coffee

src/General/Index.coffee

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

src/General/Navigate.coffee

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

src/Monitoring/ThreadStats.coffee

@@ -40,7 +40,7 @@ ThreadStats =
     if Conf['Updater and Stats in Header']
       Header.rmShortcut @dialog
     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.
 
@@ -49,6 +49,7 @@ ThreadStats =
     delete @postCountEl
     delete @fileCountEl
     delete @pageCountEl
+    delete @dialog
 
     Thread.callbacks.disconnect 'Thread Stats'
     $.off d, 'ThreadUpdate', ThreadStats.onUpdate