Merge branch 'v3'
Conflicts: builds/4chan-X.js builds/4chan-X.user.js src/General/Settings.coffee
This commit is contained in:
commit
4b8b9ad493
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -331,6 +331,10 @@ Config =
|
||||
true
|
||||
'Add \'(You)\' to quotes linking to your posts.'
|
||||
]
|
||||
'Quoted Title': [
|
||||
'Change the page title to reflect you\'ve been quoted.'
|
||||
false
|
||||
]
|
||||
'Highlight Posts Quoting You': [
|
||||
false
|
||||
'Highlights any posts that contain a quote to your post.'
|
||||
|
||||
@ -308,14 +308,13 @@ Settings =
|
||||
boards = {}
|
||||
for name, archive of Redirect.archives
|
||||
for boardID in archive.boards
|
||||
data = boards[boardID] or= {
|
||||
data = boards[boardID] or=
|
||||
thread: []
|
||||
post: []
|
||||
file: []
|
||||
}
|
||||
data.thread.push name
|
||||
data.post.push name if archive.software is 'foolfuuka'
|
||||
data.file.push name if archive.files.contains boardID
|
||||
data.post.push name if archive.software is 'foolfuuka'
|
||||
data.file.push name if archive.files.contains boardID
|
||||
|
||||
rows = []
|
||||
boardOptions = []
|
||||
@ -323,7 +322,6 @@ Settings =
|
||||
row = $.el 'tr',
|
||||
className: "board-#{boardID}"
|
||||
row.hidden = boardID isnt g.BOARD.ID
|
||||
rows.push row
|
||||
|
||||
boardOptions.push $.el 'option',
|
||||
textContent: "/#{boardID}/"
|
||||
@ -331,11 +329,9 @@ Settings =
|
||||
selected: boardID is g.BOARD.ID
|
||||
|
||||
data = boards[boardID]
|
||||
$.add row, [
|
||||
Settings.addArchiveCell boardID, data, 'thread'
|
||||
Settings.addArchiveCell boardID, data, 'post'
|
||||
Settings.addArchiveCell boardID, data, 'file'
|
||||
]
|
||||
$.add row, Settings.addArchiveCell boardID, data, item for item in ['thread', 'post', 'file']
|
||||
rows.push row
|
||||
|
||||
$.add $('tbody', section), rows
|
||||
|
||||
boardSelect = $('#archive-board-select', section)
|
||||
|
||||
@ -151,7 +151,7 @@ Unread =
|
||||
count = Unread.posts.length
|
||||
|
||||
if Conf['Unread Count']
|
||||
d.title = "#{if count or !Conf['Hide Unread Count at (0)'] then "(#{count}) " else ''}#{if g.DEAD then "/#{g.BOARD}/ - 404" else "#{Unread.title}"}"
|
||||
d.title = "#{if Conf['Quoted Title'] and Unread.postsQuotingYou.length then '(!) ' else ''}#{if count or !Conf['Hide Unread Count at (0)'] then "(#{count}) " else ''}#{if g.DEAD then "/#{g.BOARD}/ - 404" else "#{Unread.title}"}"
|
||||
<% if (type === 'crx') { %>
|
||||
# XXX Chrome bug where it doesn't always update the tab title.
|
||||
# crbug.com/124381
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user