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

Use external catalog as fallback when there is no native catalog.

Browse Source
This commit is contained in:
ccd0 2019-07-21 21:00:58 -07:00
parent 898c8e0df9
commit 6a9508371e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/General/Settings/Advanced.html
View File

@ -21,7 +21,7 @@
<fieldset> <fieldset>
<legend>External Catalog</legend> <legend>External Catalog</legend>
<div class="warning" data-feature="External Catalog"><code>External Catalog</code> is disabled.</div> <div class="warning" data-feature="External Catalog"><code>External Catalog</code> is disabled. This will be used only as a fallback.</div>
<div> <div>
URLs of external catalog sites, where <code>%board</code> is to be replaced by the board name.<br> URLs of external catalog sites, where <code>%board</code> is to be replaced by the board name.<br>
Each URL should be followed by <code>;boards:</code> and optionally <code>;exclude:</code> and a list of supported/excluded boards in the format explained in the Filter guide. Each URL should be followed by <code>;boards:</code> and optionally <code>;exclude:</code> and a list of supported/excluded boards in the format explained in the Filter guide.

4
src/Miscellaneous/CatalogLinks.coffee
View File

@ -108,8 +108,10 @@ CatalogLinks =
external external
else if Index.enabledOn(board) and Conf['Use <%= meta.name %> Catalog'] else if Index.enabledOn(board) and Conf['Use <%= meta.name %> Catalog']
CatalogLinks.jsonIndex board, '#catalog' CatalogLinks.jsonIndex board, '#catalog'
else if (nativeCatalog = Get.url 'catalog', board)
nativeCatalog
else else
Get.url 'catalog', board CatalogLinks.external board
index: (board=g.BOARD) -> index: (board=g.BOARD) ->
if Index.enabledOn(board) if Index.enabledOn(board)