diff --git a/html/General/Index-navlinks.html b/html/General/Index-navlinks.html index 7caf98685..1bd47c3cb 100644 --- a/html/General/Index-navlinks.html +++ b/html/General/Index-navlinks.html @@ -1,4 +1,3 @@ -[Catalog]  []  diff --git a/html/General/Index-pagelist.html b/html/General/Index-pagelist.html index fd5f4020b..e6923bb7a 100644 --- a/html/General/Index-pagelist.html +++ b/html/General/Index-pagelist.html @@ -9,6 +9,3 @@ -
- Catalog -
diff --git a/html/General/Settings-section-Rice.html b/html/General/Settings-section-Rice.html index 65ca4ffd7..43a9a8622 100644 --- a/html/General/Settings-section-Rice.html +++ b/html/General/Settings-section-Rice.html @@ -7,9 +7,6 @@
Board link (Replace with title when on that board): board-replace
Full text link: board-full
Custom text link: board-text:"VIP Board"
-
Index-only link: board-index
-
Catalog-only link: board-catalog
-
Combinations are possible: board-index-text:"VIP Index"
Full board list toggle: toggle-all
diff --git a/src/Filtering/Filter.coffee b/src/Filtering/Filter.coffee index 85c86d215..62abf61c3 100644 --- a/src/Filtering/Filter.coffee +++ b/src/Filtering/Filter.coffee @@ -1,7 +1,7 @@ Filter = filters: {} init: -> - return if g.VIEW is 'catalog' or !Conf['Filter'] + return if !Conf['Filter'] for key of Config.filter @filters[key] = [] @@ -166,7 +166,7 @@ Filter = menu: init: -> - return if g.VIEW is 'catalog' or !Conf['Menu'] or !Conf['Filter'] + return if !Conf['Menu'] or !Conf['Filter'] div = $.el 'div', textContent: 'Filter' diff --git a/src/Filtering/PostHiding.coffee b/src/Filtering/PostHiding.coffee index 122a7c8c4..ed621d194 100644 --- a/src/Filtering/PostHiding.coffee +++ b/src/Filtering/PostHiding.coffee @@ -1,6 +1,6 @@ PostHiding = init: -> - return if g.VIEW is 'catalog' or !Conf['Reply Hiding'] and !Conf['Reply Hiding Link'] + return if !Conf['Reply Hiding'] and !Conf['Reply Hiding Link'] @db = new DataBoard 'hiddenPosts' Post.callbacks.push @@ -20,7 +20,7 @@ PostHiding = menu: init: -> - return if g.VIEW is 'catalog' or !Conf['Menu'] or !Conf['Reply Hiding Link'] + return if !Conf['Menu'] or !Conf['Reply Hiding Link'] # Hide div = $.el 'div', diff --git a/src/Filtering/Recursive.coffee b/src/Filtering/Recursive.coffee index da5496ceb..51d7a406b 100644 --- a/src/Filtering/Recursive.coffee +++ b/src/Filtering/Recursive.coffee @@ -1,8 +1,6 @@ Recursive = recursives: {} init: -> - return if g.VIEW is 'catalog' - Post.callbacks.push name: 'Recursive' cb: @node diff --git a/src/Filtering/ThreadHiding.coffee b/src/Filtering/ThreadHiding.coffee index 155a94be1..03d8ae635 100644 --- a/src/Filtering/ThreadHiding.coffee +++ b/src/Filtering/ThreadHiding.coffee @@ -3,7 +3,6 @@ ThreadHiding = return if g.VIEW isnt 'index' @db = new DataBoard 'hiddenThreads' - @syncCatalog() $.on d, 'IndexRefresh', @onIndexRefresh Thread.callbacks.push name: 'Thread Hiding' @@ -26,50 +25,6 @@ ThreadHiding = ThreadHiding.makeStub thread, root return - syncCatalog: -> - # Sync hidden threads from the catalog into the index. - hiddenThreads = ThreadHiding.db.get - boardID: g.BOARD.ID - defaultValue: {} - hiddenThreadsOnCatalog = JSON.parse(localStorage.getItem "4chan-hide-t-#{g.BOARD}") or {} - - # Add threads that were hidden in the catalog. - for threadID of hiddenThreadsOnCatalog - unless threadID of hiddenThreads - hiddenThreads[threadID] = {} - - # Remove threads that were un-hidden in the catalog. - for threadID of hiddenThreads - unless threadID of hiddenThreadsOnCatalog - delete hiddenThreads[threadID] - - if (ThreadHiding.db.data.lastChecked or 0) > Date.now() - $.MINUTE - # Was cleaned just now. - ThreadHiding.cleanCatalog hiddenThreadsOnCatalog - - unless Object.keys(hiddenThreads).length - ThreadHiding.db.delete boardID: g.BOARD.ID - return - ThreadHiding.db.set - boardID: g.BOARD.ID - val: hiddenThreads - - cleanCatalog: (hiddenThreadsOnCatalog) -> - # We need to clean hidden threads on the catalog ourselves, - # otherwise if we don't visit the catalog regularly - # it will pollute the localStorage and our data. - $.cache "//a.4cdn.org/#{g.BOARD}/threads.json", -> - return unless @status is 200 - threads = {} - for page in @response - for thread in page.threads - if thread.no of hiddenThreadsOnCatalog - threads[thread.no] = hiddenThreadsOnCatalog[thread.no] - if Object.keys(threads).length - localStorage.setItem "4chan-hide-t-#{g.BOARD}", JSON.stringify threads - else - localStorage.removeItem "4chan-hide-t-#{g.BOARD}" - menu: init: -> return if g.VIEW isnt 'index' or !Conf['Menu'] or !Conf['Thread Hiding Link'] @@ -130,19 +85,15 @@ ThreadHiding = $.prepend root, thread.stub saveHiddenState: (thread, makeStub) -> - hiddenThreadsOnCatalog = JSON.parse(localStorage.getItem "4chan-hide-t-#{g.BOARD}") or {} if thread.isHidden ThreadHiding.db.set boardID: thread.board.ID threadID: thread.ID val: {makeStub} - hiddenThreadsOnCatalog[thread] = true else ThreadHiding.db.delete boardID: thread.board.ID threadID: thread.ID - delete hiddenThreadsOnCatalog[thread] - localStorage.setItem "4chan-hide-t-#{g.BOARD}", JSON.stringify hiddenThreadsOnCatalog toggle: (thread) -> unless thread instanceof Thread diff --git a/src/General/Config.coffee b/src/General/Config.coffee index 14b665337..06322f331 100644 --- a/src/General/Config.coffee +++ b/src/General/Config.coffee @@ -149,7 +149,6 @@ Config = 'Header auto-hide': false 'Header auto-hide on scroll': false 'Bottom header': false - 'Header catalog links': false 'Top Board List': false 'Bottom Board List': false 'Custom Board Navigation': true diff --git a/src/General/Header.coffee b/src/General/Header.coffee index e97fcdf0f..6572b1146 100644 --- a/src/General/Header.coffee +++ b/src/General/Header.coffee @@ -25,8 +25,6 @@ Header = innerHTML: ' Auto-hide header on scroll' barPositionToggler = $.el 'label', innerHTML: ' Bottom header' - catalogToggler = $.el 'label', - innerHTML: ' Use catalog board links' topBoardToggler = $.el 'label', innerHTML: ' Top original board list' botBoardToggler = $.el 'label', @@ -40,7 +38,6 @@ Header = @headerToggler = headerToggler.firstElementChild @scrollHeaderToggler = scrollHeaderToggler.firstElementChild @barPositionToggler = barPositionToggler.firstElementChild - @catalogToggler = catalogToggler.firstElementChild @topBoardToggler = topBoardToggler.firstElementChild @botBoardToggler = botBoardToggler.firstElementChild @customNavToggler = customNavToggler.firstElementChild @@ -48,7 +45,6 @@ Header = $.on @headerToggler, 'change', @toggleBarVisibility $.on @scrollHeaderToggler, 'change', @toggleHideBarOnScroll $.on @barPositionToggler, 'change', @toggleBarPosition - $.on @catalogToggler, 'change', @toggleCatalogLinks $.on @topBoardToggler, 'change', @toggleOriginalBoardList $.on @botBoardToggler, 'change', @toggleOriginalBoardList $.on @customNavToggler, 'change', @toggleCustomNav @@ -74,7 +70,6 @@ Header = {el: headerToggler} {el: scrollHeaderToggler} {el: barPositionToggler} - {el: catalogToggler} {el: topBoardToggler} {el: botBoardToggler} {el: customNavToggler} @@ -92,9 +87,6 @@ Header = if a = $ "a[href*='/#{g.BOARD}/']", $.id 'boardNavDesktopFoot' a.className = 'current' - Header.setCatalogLinks Conf['Header catalog links'] - $.sync 'Header catalog links', Header.setCatalogLinks - @enableDesktopNotifications() setBoardList: -> @@ -121,7 +113,7 @@ Header = $.rmAll list return unless text as = $$ '#full-board-list a[title]', Header.bar - nodes = text.match(/[\w@]+(-(all|title|replace|full|index|catalog|text:"[^"]+"))*|[^\w@]+/g).map (t) -> + nodes = text.match(/[\w@]+(-(all|title|replace|full|text:"[^"]+"))*|[^\w@]+/g).map (t) -> if /^[^\w@]/.test t return $.tn t if /^toggle-all/.test t @@ -148,11 +140,6 @@ Header = else a.textContent - if m = t.match /-(index|catalog)/ - a.dataset.only = m[1] - a.href = "//boards.4chan.org/#{board}/" - a.href += 'catalog' if m[1] is 'catalog' - $.addClass a, 'navSmall' if board is '@' return a $.tn t @@ -219,21 +206,6 @@ Header = $.cb.checked.call @ Header.setBarPosition @checked - setCatalogLinks: (useCatalog) -> - Header.catalogToggler.checked = useCatalog - as = $$ [ - '#board-list a' - '#boardNavDesktop a' - '#boardNavDesktopFoot a' - ].join ', ' - path = if useCatalog then 'catalog' else '' - for a in as when a.hostname is 'boards.4chan.org' and not a.dataset.only - a.pathname = "/#{a.pathname.split('/')[1]}/#{path}" - return - toggleCatalogLinks: -> - $.cb.checked.call @ - Header.setCatalogLinks @checked - setTopBoardList: (show) -> Header.topBoardToggler.checked = show if show diff --git a/src/General/Index.coffee b/src/General/Index.coffee index 1ce167006..df3545264 100644 --- a/src/General/Index.coffee +++ b/src/General/Index.coffee @@ -1,15 +1,5 @@ Index = init: -> - if g.VIEW is 'catalog' - $.ready -> - span = $.el 'a', - href: '<%= meta.repo %>blob/<%= meta.mainBranch %>/CHANGELOG.md' - textContent: 'Support for the official catalog to be removed' - title: '<%= meta.name %> now has a "catalog" Index mode.' - className: 'btn-wrap warning' - target: '_blank' - $.add $.id('info'), span - return if g.VIEW isnt 'index' or g.BOARD.ID is 'f' @db = new DataBoard 'pinnedThreads' @@ -179,7 +169,6 @@ Index = a = e.target else return - return if a.textContent is 'Catalog' e.preventDefault() Index.userPageNav +a.pathname.split('/')[2] diff --git a/src/General/Main.coffee b/src/General/Main.coffee index 254d2cba4..d8dc3014b 100644 --- a/src/General/Main.coffee +++ b/src/General/Main.coffee @@ -11,6 +11,8 @@ Main = 'catalog' else 'index' + if g.VIEW is 'catalog' + return if g.VIEW is 'thread' g.THREADID = +pathname[3] @@ -131,10 +133,6 @@ Main = $.addClass doc, 'fourchan-x', '<% if (type === 'crx') { %>blink<% } else { %>gecko<% } %>' $.addStyle Main.css - if g.VIEW is 'catalog' - $.addClass doc, $.id('base-css').href.match(/catalog_(\w+)/)[1].replace('_new', '').replace /_+/g, '-' - return - style = 'yotsuba-b' mainStyleSheet = $ 'link[title=switch]', d.head styleSheets = $$ 'link[rel="alternate stylesheet"]', d.head diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee index 0d85a8d44..3359a82db 100644 --- a/src/General/Settings.coffee +++ b/src/General/Settings.coffee @@ -133,10 +133,7 @@ Settings = button.textContent = "Hidden: #{hiddenNum}" $.on button, 'click', -> @textContent = 'Hidden: 0' - $.get 'hiddenThreads', {}, ({hiddenThreads}) -> - for boardID of hiddenThreads.boards - localStorage.removeItem "4chan-hide-t-#{boardID}" - $.delete ['hiddenThreads', 'hiddenPosts'] + $.delete ['hiddenThreads', 'hiddenPosts'] $.after $('input[name="Stubs"]', section).parentNode.parentNode, div export: -> # Make sure to export the most recent data. diff --git a/src/Images/AutoGIF.coffee b/src/Images/AutoGIF.coffee index a80481407..25907deb5 100644 --- a/src/Images/AutoGIF.coffee +++ b/src/Images/AutoGIF.coffee @@ -1,6 +1,6 @@ AutoGIF = init: -> - return if g.VIEW is 'catalog' or !Conf['Auto-GIF'] or g.BOARD.ID in ['gif', 'wsg'] + return if !Conf['Auto-GIF'] or g.BOARD.ID in ['gif', 'wsg'] Post.callbacks.push name: 'Auto-GIF' diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee index 13816680c..29f72cfa1 100644 --- a/src/Images/ImageExpand.coffee +++ b/src/Images/ImageExpand.coffee @@ -1,6 +1,6 @@ ImageExpand = init: -> - return if g.VIEW is 'catalog' or !Conf['Image Expansion'] + return if !Conf['Image Expansion'] @EAI = $.el 'a', className: 'expand-all-shortcut fa fa-expand' @@ -156,7 +156,7 @@ ImageExpand = menu: init: -> - return if g.VIEW is 'catalog' or !Conf['Image Expansion'] + return if !Conf['Image Expansion'] el = $.el 'span', textContent: 'Image Expansion' diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee index f205c941c..25363da5e 100644 --- a/src/Images/ImageHover.coffee +++ b/src/Images/ImageHover.coffee @@ -1,6 +1,6 @@ ImageHover = init: -> - return if g.VIEW is 'catalog' or !Conf['Image Hover'] + return if !Conf['Image Hover'] Post.callbacks.push name: 'Image Hover' diff --git a/src/Images/RevealSpoilers.coffee b/src/Images/RevealSpoilers.coffee index 52f7dffe6..1d925ce91 100644 --- a/src/Images/RevealSpoilers.coffee +++ b/src/Images/RevealSpoilers.coffee @@ -1,6 +1,6 @@ RevealSpoilers = init: -> - return if g.VIEW is 'catalog' or !Conf['Reveal Spoilers'] + return if !Conf['Reveal Spoilers'] Post.callbacks.push name: 'Reveal Spoilers' diff --git a/src/Images/Sauce.coffee b/src/Images/Sauce.coffee index 8e7f06e06..e2854b23c 100644 --- a/src/Images/Sauce.coffee +++ b/src/Images/Sauce.coffee @@ -1,6 +1,6 @@ Sauce = init: -> - return if g.VIEW is 'catalog' or !Conf['Sauce'] + return if !Conf['Sauce'] links = [] for link in Conf['sauces'].split '\n' diff --git a/src/Linkification/Linkify.coffee b/src/Linkification/Linkify.coffee index fd90879e6..bad4bedc1 100644 --- a/src/Linkification/Linkify.coffee +++ b/src/Linkification/Linkify.coffee @@ -1,6 +1,6 @@ Linkify = init: -> - return if g.VIEW is 'catalog' or !Conf['Linkify'] + return if !Conf['Linkify'] # gruber revised + magnet support # http://df4.us/fv9 diff --git a/src/Menu/ArchiveLink.coffee b/src/Menu/ArchiveLink.coffee index f691d6f95..88ecc21b5 100644 --- a/src/Menu/ArchiveLink.coffee +++ b/src/Menu/ArchiveLink.coffee @@ -1,6 +1,6 @@ ArchiveLink = init: -> - return if g.VIEW is 'catalog' or !Conf['Menu'] or !Conf['Archive Link'] + return if !Conf['Menu'] or !Conf['Archive Link'] div = $.el 'div', textContent: 'Archive' diff --git a/src/Menu/DeleteLink.coffee b/src/Menu/DeleteLink.coffee index 1805047f8..c79f24c98 100644 --- a/src/Menu/DeleteLink.coffee +++ b/src/Menu/DeleteLink.coffee @@ -1,6 +1,6 @@ DeleteLink = init: -> - return if g.VIEW is 'catalog' or !Conf['Menu'] or !Conf['Delete Link'] + return if !Conf['Menu'] or !Conf['Delete Link'] div = $.el 'div', className: 'delete-link' diff --git a/src/Menu/DownloadLink.coffee b/src/Menu/DownloadLink.coffee index 4dcc043f0..a93cfd8c0 100644 --- a/src/Menu/DownloadLink.coffee +++ b/src/Menu/DownloadLink.coffee @@ -1,6 +1,6 @@ DownloadLink = init: -> - return if g.VIEW is 'catalog' or !Conf['Menu'] or !Conf['Download Link'] + return if !Conf['Menu'] or !Conf['Download Link'] a = $.el 'a', className: 'download-link' diff --git a/src/Menu/Menu.coffee b/src/Menu/Menu.coffee index 23fb2ce91..134f6ec1e 100644 --- a/src/Menu/Menu.coffee +++ b/src/Menu/Menu.coffee @@ -1,6 +1,6 @@ Menu = init: -> - return if g.VIEW is 'catalog' or !Conf['Menu'] + return if !Conf['Menu'] @menu = new UI.Menu 'post' Post.callbacks.push diff --git a/src/Menu/ReportLink.coffee b/src/Menu/ReportLink.coffee index 435006c6d..c246c903f 100644 --- a/src/Menu/ReportLink.coffee +++ b/src/Menu/ReportLink.coffee @@ -1,6 +1,6 @@ ReportLink = init: -> - return if g.VIEW is 'catalog' or !Conf['Menu'] or !Conf['Report Link'] + return if !Conf['Menu'] or !Conf['Report Link'] a = $.el 'a', className: 'report-link' diff --git a/src/Miscellaneous/Anonymize.coffee b/src/Miscellaneous/Anonymize.coffee index 414c428e5..5b9f4e6a1 100644 --- a/src/Miscellaneous/Anonymize.coffee +++ b/src/Miscellaneous/Anonymize.coffee @@ -1,6 +1,6 @@ Anonymize = init: -> - return if g.VIEW is 'catalog' or !Conf['Anonymize'] + return if !Conf['Anonymize'] Post.callbacks.push name: 'Anonymize' diff --git a/src/Miscellaneous/Dice.coffee b/src/Miscellaneous/Dice.coffee index d02698344..8729d9faf 100644 --- a/src/Miscellaneous/Dice.coffee +++ b/src/Miscellaneous/Dice.coffee @@ -1,6 +1,6 @@ Dice = init: -> - return if g.BOARD.ID isnt 'tg' or g.VIEW is 'catalog' or !Conf['Show Dice Roll'] + return if g.BOARD.ID isnt 'tg' or !Conf['Show Dice Roll'] Post.callbacks.push name: 'Show Dice Roll' cb: @node diff --git a/src/Miscellaneous/FileInfo.coffee b/src/Miscellaneous/FileInfo.coffee index e58f9faef..0534b2c33 100644 --- a/src/Miscellaneous/FileInfo.coffee +++ b/src/Miscellaneous/FileInfo.coffee @@ -1,6 +1,6 @@ FileInfo = init: -> - return if g.VIEW is 'catalog' or !Conf['File Info Formatting'] + return if !Conf['File Info Formatting'] @funk = @createFunc Conf['fileInfo'] Post.callbacks.push diff --git a/src/Miscellaneous/Fourchan.coffee b/src/Miscellaneous/Fourchan.coffee index 6f290d662..ff904ecb2 100644 --- a/src/Miscellaneous/Fourchan.coffee +++ b/src/Miscellaneous/Fourchan.coffee @@ -1,7 +1,5 @@ Fourchan = init: -> - return if g.VIEW is 'catalog' - board = g.BOARD.ID if board is 'g' $.globalEval """ diff --git a/src/Miscellaneous/IDColor.coffee b/src/Miscellaneous/IDColor.coffee index 1fbdd5718..4ce769ad7 100644 --- a/src/Miscellaneous/IDColor.coffee +++ b/src/Miscellaneous/IDColor.coffee @@ -1,6 +1,6 @@ IDColor = init: -> - return if g.VIEW is 'catalog' or !Conf['Color User IDs'] + return if !Conf['Color User IDs'] @ids = {} Post.callbacks.push diff --git a/src/Miscellaneous/Keybinds.coffee b/src/Miscellaneous/Keybinds.coffee index c158cb183..6fd4de92c 100644 --- a/src/Miscellaneous/Keybinds.coffee +++ b/src/Miscellaneous/Keybinds.coffee @@ -1,6 +1,6 @@ Keybinds = init: -> - return if g.VIEW is 'catalog' or !Conf['Keybinds'] + return if !Conf['Keybinds'] for hotkey of Conf.hotkeys $.sync hotkey, Keybinds.sync diff --git a/src/Miscellaneous/Nav.coffee b/src/Miscellaneous/Nav.coffee index 659cce4e1..0c93cc2d5 100644 --- a/src/Miscellaneous/Nav.coffee +++ b/src/Miscellaneous/Nav.coffee @@ -5,8 +5,6 @@ Nav = return unless Conf['Index Navigation'] when 'thread' return unless Conf['Reply Navigation'] - else # catalog - return span = $.el 'span', id: 'navlinks' diff --git a/src/Miscellaneous/Time.coffee b/src/Miscellaneous/Time.coffee index 60239f627..4bb2b4919 100644 --- a/src/Miscellaneous/Time.coffee +++ b/src/Miscellaneous/Time.coffee @@ -1,6 +1,6 @@ Time = init: -> - return if g.VIEW is 'catalog' or !Conf['Time Formatting'] + return if !Conf['Time Formatting'] @funk = @createFunc Conf['time'] Post.callbacks.push diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee index 2eed475ff..9b5f92aba 100644 --- a/src/Posting/QR.coffee +++ b/src/Posting/QR.coffee @@ -57,7 +57,7 @@ QR = persist: -> QR.open() - QR.hide() if Conf['Auto-Hide QR'] or g.VIEW is 'catalog' + QR.hide() if Conf['Auto-Hide QR'] open: -> if QR.nodes QR.nodes.el.hidden = false diff --git a/src/Quotelinks/QuoteBacklink.coffee b/src/Quotelinks/QuoteBacklink.coffee index cb407e50e..5383e1dfd 100644 --- a/src/Quotelinks/QuoteBacklink.coffee +++ b/src/Quotelinks/QuoteBacklink.coffee @@ -11,7 +11,7 @@ QuoteBacklink = # This is is so that fetched posts can get their backlinks, # and that as much backlinks are appended in the background as possible. init: -> - return if g.VIEW is 'catalog' or !Conf['Quote Backlinks'] + return if !Conf['Quote Backlinks'] format = Conf['backlink'].replace /%id/g, "' + id + '" @funk = Function 'id', "return '#{format}'" diff --git a/src/Quotelinks/QuoteCT.coffee b/src/Quotelinks/QuoteCT.coffee index 9ba959acd..62735db26 100644 --- a/src/Quotelinks/QuoteCT.coffee +++ b/src/Quotelinks/QuoteCT.coffee @@ -1,6 +1,6 @@ QuoteCT = init: -> - return if g.VIEW is 'catalog' or !Conf['Mark Cross-thread Quotes'] + return if !Conf['Mark Cross-thread Quotes'] # \u00A0 is nbsp @text = '\u00A0(Cross-thread)' diff --git a/src/Quotelinks/QuoteInline.coffee b/src/Quotelinks/QuoteInline.coffee index 526bf75fc..b61aa5af3 100644 --- a/src/Quotelinks/QuoteInline.coffee +++ b/src/Quotelinks/QuoteInline.coffee @@ -1,6 +1,6 @@ QuoteInline = init: -> - return if g.VIEW is 'catalog' or !Conf['Quote Inlining'] + return if !Conf['Quote Inlining'] Post.callbacks.push name: 'Quote Inlining' diff --git a/src/Quotelinks/QuoteOP.coffee b/src/Quotelinks/QuoteOP.coffee index 4e80520ff..65e468fe9 100644 --- a/src/Quotelinks/QuoteOP.coffee +++ b/src/Quotelinks/QuoteOP.coffee @@ -1,6 +1,6 @@ QuoteOP = init: -> - return if g.VIEW is 'catalog' or !Conf['Mark OP Quotes'] + return if !Conf['Mark OP Quotes'] # \u00A0 is nbsp @text = '\u00A0(OP)' diff --git a/src/Quotelinks/QuotePreview.coffee b/src/Quotelinks/QuotePreview.coffee index 1b1694344..d138cdd81 100644 --- a/src/Quotelinks/QuotePreview.coffee +++ b/src/Quotelinks/QuotePreview.coffee @@ -1,6 +1,6 @@ QuotePreview = init: -> - return if g.VIEW is 'catalog' or !Conf['Quote Previewing'] + return if !Conf['Quote Previewing'] Post.callbacks.push name: 'Quote Previewing' diff --git a/src/Quotelinks/QuoteStrikeThrough.coffee b/src/Quotelinks/QuoteStrikeThrough.coffee index b24273322..bf3120516 100644 --- a/src/Quotelinks/QuoteStrikeThrough.coffee +++ b/src/Quotelinks/QuoteStrikeThrough.coffee @@ -1,6 +1,6 @@ QuoteStrikeThrough = init: -> - return if g.VIEW is 'catalog' or !Conf['Reply Hiding'] and !Conf['Reply Hiding Link'] and !Conf['Filter'] + return if !Conf['Reply Hiding'] and !Conf['Reply Hiding Link'] and !Conf['Filter'] Post.callbacks.push name: 'Strike-through Quotes' diff --git a/src/Quotelinks/QuoteYou.coffee b/src/Quotelinks/QuoteYou.coffee index 4f7219149..a480916a8 100644 --- a/src/Quotelinks/QuoteYou.coffee +++ b/src/Quotelinks/QuoteYou.coffee @@ -1,6 +1,6 @@ QuoteYou = init: -> - return if g.VIEW is 'catalog' or !Conf['Mark Quotes of You'] or !Conf['Quick Reply'] + return if !Conf['Mark Quotes of You'] or !Conf['Quick Reply'] # \u00A0 is nbsp @text = '\u00A0(You)' diff --git a/src/Quotelinks/Quotify.coffee b/src/Quotelinks/Quotify.coffee index 0b7503b94..0cd5bbcea 100644 --- a/src/Quotelinks/Quotify.coffee +++ b/src/Quotelinks/Quotify.coffee @@ -1,6 +1,6 @@ Quotify = init: -> - return if g.VIEW is 'catalog' or !Conf['Resurrect Quotes'] + return if !Conf['Resurrect Quotes'] Post.callbacks.push name: 'Resurrect Quotes'