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

Further archive link work.

Browse Source 
Conflicts:
	src/General/Header.coffee
This commit is contained in:
milky 2014-02-06 05:47:19 +11:00 committed by ccd0
parent 9e1f0a12c0
commit 9daf6dd05f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Archive/Redirect.coffee
View File

@ -27,7 +27,7 @@ Redirect =
archives: `<%= JSON.stringify(grunt.file.readJSON('src/Archive/archives.json')) %>` archives: `<%= JSON.stringify(grunt.file.readJSON('src/Archive/archives.json')) %>`
to: (dest, data) -> to: (dest, data) ->
archive = (if dest is 'search' or 'board' then Redirect.data.thread else Redirect.data[dest])[data.boardID] archive = (if dest in ['search', 'board'] then Redirect.data.thread else Redirect.data[dest])[data.boardID]
return '' unless archive return '' unless archive
Redirect[dest] archive, data Redirect[dest] archive, data

5
src/General/Header.coffee
View File

@ -208,9 +208,8 @@ Header =
a.href = CatalogLinks[m[1]] board a.href = CatalogLinks[m[1]] board
$.addClass a, 'catalog' if m[1] is 'catalog' $.addClass a, 'catalog' if m[1] is 'catalog'
if /-archive/.test t if /-archive/.test(t) and href = Redirect.to 'board', {boardID: board}
a.href = Redirect.to 'board', a.href = href
boardID: board
$.addClass a, 'navSmall' if board is '@' $.addClass a, 'navSmall' if board is '@'
return a return a