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

Merge branch 'v3' of https://github.com/zixaphir/appchan-x

Browse Source
This commit is contained in:
Jordan Bates 2013-05-14 13:17:21 -07:00
commit b69dfd5921
6 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builds/4chan-X.js
View File

File diff suppressed because one or more lines are too long

13
builds/4chan-X.user.js
View File

File diff suppressed because one or more lines are too long

13
builds/crx/script.js
View File

File diff suppressed because one or more lines are too long

4
src/General/Config.coffee
View File

@ -331,6 +331,10 @@ Config =
true true
'Add \'(You)\' to quotes linking to your posts.' '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': [ 'Highlight Posts Quoting You': [
false false
'Highlights any posts that contain a quote to your post.' 'Highlights any posts that contain a quote to your post.'

18
src/General/Settings.coffee
View File

@ -311,7 +311,7 @@ Settings =
section.innerHTML = """ section.innerHTML = """
<%= grunt.file.read('src/General/html/Settings/Advanced.html').replace(/>\s+</g, '><').trim() %> <%= grunt.file.read('src/General/html/Settings/Advanced.html').replace(/>\s+</g, '><').trim() %>
""" """
items = {} items = {}
inputs = {} inputs = {}
for name in ['boardnav', 'time', 'backlink', 'fileInfo', 'favicon', 'sageEmoji', 'emojiPos', 'usercss'] for name in ['boardnav', 'time', 'backlink', 'fileInfo', 'favicon', 'sageEmoji', 'emojiPos', 'usercss']
input = $ "[name=#{name}]", section input = $ "[name=#{name}]", section
@ -346,14 +346,13 @@ Settings =
boards = {} boards = {}
for name, archive of Redirect.archives for name, archive of Redirect.archives
for boardID in archive.boards for boardID in archive.boards
data = boards[boardID] or= { data = boards[boardID] or=
thread: [] thread: []
post: [] post: []
file: [] file: []
}
data.thread.push name data.thread.push name
data.post.push name if archive.software is 'foolfuuka' data.post.push name if archive.software is 'foolfuuka'
data.file.push name if archive.files.contains boardID data.file.push name if archive.files.contains boardID
rows = [] rows = []
boardOptions = [] boardOptions = []
@ -361,7 +360,6 @@ Settings =
row = $.el 'tr', row = $.el 'tr',
className: "board-#{boardID}" className: "board-#{boardID}"
row.hidden = boardID isnt g.BOARD.ID row.hidden = boardID isnt g.BOARD.ID
rows.push row
boardOptions.push $.el 'option', boardOptions.push $.el 'option',
textContent: "/#{boardID}/" textContent: "/#{boardID}/"
@ -369,11 +367,9 @@ Settings =
selected: boardID is g.BOARD.ID selected: boardID is g.BOARD.ID
data = boards[boardID] data = boards[boardID]
$.add row, [ $.add row, Settings.addArchiveCell boardID, data, item for item in ['thread', 'post', 'file']
Settings.addArchiveCell boardID, data, 'thread' rows.push row
Settings.addArchiveCell boardID, data, 'post'
Settings.addArchiveCell boardID, data, 'file'
]
$.add $('tbody', section), rows $.add $('tbody', section), rows
boardSelect = $('#archive-board-select', section) boardSelect = $('#archive-board-select', section)

2
src/Monitoring/Unread.coffee
View File

@ -151,7 +151,7 @@ Unread =
count = Unread.posts.length count = Unread.posts.length
if Conf['Unread Count'] 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') { %> <% if (type === 'crx') { %>
# XXX Chrome bug where it doesn't always update the tab title. # XXX Chrome bug where it doesn't always update the tab title.
# crbug.com/124381 # crbug.com/124381