Merge branch 'next'

src/General/Config.coffee

@@ -574,7 +574,7 @@ Config =
       ]
       'Quote Threading': [
         false
-        'Thread conversations'
+        'Thread conversations.'
       ]
 
   imageExpansion:
@@ -1013,6 +1013,6 @@ Config =
   customCooldown: 0
   customCooldownEnabled: true
 
-  pruneReplies:
+  replyPruning:
     'Prune Replies': false
     'Max Replies': 1000

src/General/Main.coffee

@@ -467,7 +467,7 @@ Main =
     ['Keybinds',                  Keybinds]
     ['Banner',                    Banner]
     ['Flash Features',            Flash]
-    ['Prune Replies',             PruneReplies]
+    ['Reply Pruning',             ReplyPruning]
     <% if (tests_enabled) { %>
     ['Build Test',                BuildTest]
     <% } %>

src/Miscellaneous/CatalogLinks.coffee

@@ -47,7 +47,7 @@ CatalogLinks =
   # Set links on load or custom board list change.
   # Called by Header when both board lists (header and footer) are ready.
   initBoardList: ->
-    return unless Conf['Catalog Links']
+    return unless CatalogLinks.el
     CatalogLinks.set Conf['Header catalog links']
 
   toggle: ->

src/Monitoring/ReplyPruning.coffee

@@ -1,4 +1,4 @@
-PruneReplies =
+ReplyPruning =
   init: ->
     return unless g.VIEW is 'thread' and not Conf['Quote Threading']
 
@@ -21,7 +21,7 @@ PruneReplies =
       order: 190
 
     Thread.callbacks.push
-      name: 'Prune Replies'
+      name: 'Reply Pruning'
       cb:   @node
 
   position: 0
@@ -29,44 +29,44 @@ PruneReplies =
   total: 0
 
   node: ->
-    PruneReplies.thread = @
+    ReplyPruning.thread = @
-    PruneReplies.total = @posts.keys.length - 1
+    ReplyPruning.total = @posts.keys.length - 1
-    $.on PruneReplies.inputs.enabled, 'change', PruneReplies.setEnabled
+    $.on ReplyPruning.inputs.enabled, 'change', ReplyPruning.setEnabled
-    $.on PruneReplies.inputs.enabled, 'change', PruneReplies.update
+    $.on ReplyPruning.inputs.enabled, 'change', ReplyPruning.update
     if Conf['Prune Replies']
-      PruneReplies.setEnabled()
+      ReplyPruning.setEnabled()
-      PruneReplies.update()
+      ReplyPruning.update()
 
   setEnabled: ->
-    PruneReplies.container or= $.frag()
+    ReplyPruning.container or= $.frag()
     onOff = if Conf['Prune Replies'] then $.on else $.off
-    onOff PruneReplies.inputs.replies, 'change',       PruneReplies.update
+    onOff ReplyPruning.inputs.replies, 'change',       ReplyPruning.update
-    onOff d,                           'ThreadUpdate', PruneReplies.update
+    onOff d,                           'ThreadUpdate', ReplyPruning.update
 
   update: (e) ->
     if e and e.type is 'ThreadUpdate' and not e.detail[404]
-      PruneReplies.total += e.detail.newPosts.length
+      ReplyPruning.total += e.detail.newPosts.length
 
     hidden2 = if Conf['Prune Replies']
-      Math.max(PruneReplies.total - +Conf["Max Replies"], 0)
+      Math.max(ReplyPruning.total - +Conf["Max Replies"], 0)
     else
       0
 
-    {posts, OP} = PruneReplies.thread
+    {posts, OP} = ReplyPruning.thread
 
-    if PruneReplies.hidden < hidden2
+    if ReplyPruning.hidden < hidden2
-      while PruneReplies.hidden < hidden2 and PruneReplies.position < posts.keys.length
+      while ReplyPruning.hidden < hidden2 and ReplyPruning.position < posts.keys.length
-        post = posts[posts.keys[PruneReplies.position++]]
+        post = posts[posts.keys[ReplyPruning.position++]]
         if post.isReply and not post.isFetchedQuote
-          $.add PruneReplies.container, post.nodes.root
+          $.add ReplyPruning.container, post.nodes.root
-          PruneReplies.hidden++
+          ReplyPruning.hidden++
 
-    else if PruneReplies.hidden > hidden2
+    else if ReplyPruning.hidden > hidden2
       frag = $.frag()
-      while PruneReplies.hidden > hidden2 and PruneReplies.position > 0
+      while ReplyPruning.hidden > hidden2 and ReplyPruning.position > 0
-        post = posts[posts.keys[--PruneReplies.position]]
+        post = posts[posts.keys[--ReplyPruning.position]]
         if post.isReply and not post.isFetchedQuote
           $.prepend frag, post.nodes.root
-          PruneReplies.hidden--
+          ReplyPruning.hidden--
       $.after OP.nodes.root, frag
       $.event 'PostsInserted'

src/classes/Fetcher.coffee

@@ -129,7 +129,7 @@ class Fetcher
         @archiveTags[text]
       else
         greentext = text[0] is '>'
-        text = text.replace /(\[\/?[a-z]+):lit(\])/, '$1$2'
+        text = text.replace /(\[\/?[a-z]+):lit(\])/g, '$1$2'
         text = for text2, j in text.split /(>>(?:>\/[a-z\d]+\/)?\d+)/g
           <%= html('?{j % 2}{<span class="deadlink">${text2}</span>}{${text2}}') %>
         text = <%= html('?{greentext}{<span class="quote">@{text}</span>}{@{text}}') %>