From b9e8ff0b1964c767fe654114f86c8000687b5c7a Mon Sep 17 00:00:00 2001 From: Mayhem Date: Sat, 1 Feb 2014 20:42:59 +0100 Subject: [PATCH] Make the hidden label an integral part of the index. --- html/General/Index-navlinks.html | 1 + src/Filtering/ThreadHiding.coffee | 4 ++-- src/General/Index.coffee | 19 +++++-------------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/html/General/Index-navlinks.html b/html/General/Index-navlinks.html index 7caf98685..53a1304a5 100644 --- a/html/General/Index-navlinks.html +++ b/html/General/Index-navlinks.html @@ -2,3 +2,4 @@ [ + diff --git a/src/Filtering/ThreadHiding.coffee b/src/Filtering/ThreadHiding.coffee index 28684f1fa..39397d999 100644 --- a/src/Filtering/ThreadHiding.coffee +++ b/src/Filtering/ThreadHiding.coffee @@ -157,7 +157,7 @@ ThreadHiding = return if thread.isHidden threadRoot = thread.OP.nodes.root.parentNode thread.isHidden = true - Index.updateHideToggle() + Index.updateHideLabel() unless makeStub threadRoot.hidden = threadRoot.nextElementSibling.hidden = true #
@@ -172,4 +172,4 @@ ThreadHiding = threadRoot = thread.OP.nodes.root.parentNode threadRoot.nextElementSibling.hidden = threadRoot.hidden = thread.isHidden = false - Index.updateHideToggle() + Index.updateHideLabel() diff --git a/src/General/Index.coffee b/src/General/Index.coffee index d71178d3d..f62752982 100644 --- a/src/General/Index.coffee +++ b/src/General/Index.coffee @@ -96,6 +96,7 @@ Index = className: 'navLinks' innerHTML: <%= importHTML('General/Index-navlinks') %> @searchInput = $ '#index-search', @navLinks + @hideLabel = $ '#hidden-label', @navLinks @currentPage = @getCurrentPage() $.on window, 'popstate', @cb.popstate $.on @pagelist, 'click', @cb.pageNav @@ -249,28 +250,18 @@ Index = $.before a, strong $.add strong, a - updateHideToggle: -> + updateHideLabel: -> hiddenCount = 0 for threadID, thread of g.BOARD.threads when thread.isHidden hiddenCount++ if thread.ID in Index.liveThreadIDs unless hiddenCount - Index.removeHideToggle() + Index.hideLabel.hidden = true return - unless Index.toggler - Index.addHideToggle() + Index.hideLabel.hidden = false $('#hidden-count', Index.navLinks).textContent = if hiddenCount is 1 '1 hidden thread' else "#{hiddenCount} hidden threads" - addHideToggle: -> - Index.toggler = $.el 'span', - id: 'hidden-label' - innerHTML: ' — ' - $.add Index.navLinks, Index.toggler - removeHideToggle: -> - return unless Index.toggler - $.rm Index.toggler - delete Index.toggler update: (pageNum) -> return unless navigator.onLine @@ -390,7 +381,7 @@ Index = $.nodes Index.nodes Main.callbackNodes Thread, threads Main.callbackNodes Post, posts - Index.updateHideToggle() + Index.updateHideLabel() $.event 'IndexRefresh' buildReplies: (threadRoots) -> posts = []