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

Fix custom board links for boards without native catalog/archive being changed to nonexistent native catalog/archive links on catalog/archive pages. #2390

Browse Source
This commit is contained in:
ccd0 2019-08-06 23:38:17 -07:00
parent d09ef5396e
commit 9ee9f2c2c6
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/General/Get.coffee
View File

@ -1,6 +1,9 @@
Get = Get =
url: (type, IDs, args...) -> url: (type, IDs, args...) ->
g.sites[IDs.siteID]?.urls[type] IDs, args... if (site = g.sites[IDs.siteID]) and (f = $.getOwn(site.urls, type))
f IDs, args...
else
undefined
threadExcerpt: (thread) -> threadExcerpt: (thread) ->
{OP} = thread {OP} = thread
excerpt = ("/#{decodeURIComponent thread.board.ID}/ - ") + ( excerpt = ("/#{decodeURIComponent thread.board.ID}/ - ") + (

3
src/General/Header.coffee
View File

@ -256,7 +256,8 @@ Header =
href: "//#{BoardConfig.domain(boardID)}/#{boardID}/" href: "//#{BoardConfig.domain(boardID)}/#{boardID}/"
textContent: boardID textContent: boardID
title: BoardConfig.title(boardID) title: BoardConfig.title(boardID)
a.href += g.VIEW if g.VIEW in ['catalog', 'archive'] if g.VIEW in ['catalog', 'archive'] and (urlV = Get.url g.VIEW, {siteID: '4chan.org', boardID})
a.href = urlV
a.className = 'current' if a.hostname is location.hostname and boardID is g.BOARD.ID a.className = 'current' if a.hostname is location.hostname and boardID is g.BOARD.ID
a a

1
src/site/SW.yotsuba.coffee
View File

@ -7,6 +7,7 @@ SW.yotsuba =
post: ({postID}) -> "#p#{postID}" post: ({postID}) -> "#p#{postID}"
index: ({boardID}) -> "#{location.protocol}//#{BoardConfig.domain(boardID)}/#{boardID}/" index: ({boardID}) -> "#{location.protocol}//#{BoardConfig.domain(boardID)}/#{boardID}/"
catalog: ({boardID}) -> if boardID is 'f' then undefined else "#{location.protocol}//#{BoardConfig.domain(boardID)}/#{boardID}/catalog" catalog: ({boardID}) -> if boardID is 'f' then undefined else "#{location.protocol}//#{BoardConfig.domain(boardID)}/#{boardID}/catalog"
archive: ({boardID}) -> if BoardConfig.isArchived(boardID) then "#{location.protocol}//#{BoardConfig.domain(boardID)}/#{boardID}/archive" else undefined
threadJSON: ({boardID, threadID}) -> "#{location.protocol}//a.4cdn.org/#{boardID}/thread/#{threadID}.json" threadJSON: ({boardID, threadID}) -> "#{location.protocol}//a.4cdn.org/#{boardID}/thread/#{threadID}.json"
threadsListJSON: ({boardID}) -> "#{location.protocol}//a.4cdn.org/#{boardID}/threads.json" threadsListJSON: ({boardID}) -> "#{location.protocol}//a.4cdn.org/#{boardID}/threads.json"
archiveListJSON: ({boardID}) -> if BoardConfig.isArchived(boardID) then "#{location.protocol}//a.4cdn.org/#{boardID}/archive.json" else '' archiveListJSON: ({boardID}) -> if BoardConfig.isArchived(boardID) then "#{location.protocol}//a.4cdn.org/#{boardID}/archive.json" else ''