Merge branch 'v3'

Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-05-03 06:29:56 -07:00
commit 9d3ad61925
6 changed files with 10 additions and 10 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -39,7 +39,7 @@ Navigate =
post: -> # Allows us to navigate via JSON from thread to thread by hashes and quote highlights. post: -> # Allows us to navigate via JSON from thread to thread by hashes and quote highlights.
# We don't need to reload the thread inside the thread # We don't need to reload the thread inside the thread
unless g.VIEW is 'thread' and @thread.ID is g.THREADID unless g.VIEW is 'thread' and @thread.ID is g.THREADID
$.on $('a[title="Highlight this post"]', @nodes.info), 'click', Navigate.navigate $.on $('a[title="Link to this post"]', @nodes.info), 'click', Navigate.navigate
return unless (linktype = if Conf['Quote Inlining'] and Conf['Quote Hash Navigation'] return unless (linktype = if Conf['Quote Inlining'] and Conf['Quote Hash Navigation']
'.hashlink' '.hashlink'

View File

@ -8,7 +8,7 @@
#search-label, #search-label,
#search-label-bottom, #search-label-bottom,
#styleSwitcher, #styleSwitcher,
#togglePostForm, #togglePostFormLink,
.boardBanner > div, .boardBanner > div,
.next form, .next form,
.next span, .next span,

View File

@ -18,7 +18,7 @@
</span>#{" "} </span>#{" "}
<span class=dateTime data-utc=#{dateUTC}>#{date}</span>#{' '} <span class=dateTime data-utc=#{dateUTC}>#{date}</span>#{' '}
<span class='postNum'> <span class='postNum'>
<a href=#{"/#{boardID}/thread/#{threadID}#p#{postID}"} title='Highlight this post'>No.</a> <a href=#{"/#{boardID}/thread/#{threadID}#p#{postID}"} title='Link to this post'>No.</a>
<a href='#{ <a href='#{
if g.VIEW is 'thread' and g.THREADID is +threadID then if g.VIEW is 'thread' and g.THREADID is +threadID then
"javascript:quote(#{postID})" "javascript:quote(#{postID})"

View File

@ -111,7 +111,7 @@ Gallery =
title: title title: title
thumb.dataset.id = Gallery.images.length thumb.dataset.id = Gallery.images.length
thumb.dataset.post = $('a[title="Highlight this post"]', post.nodes.info).href thumb.dataset.post = $('a[title="Link to this post"]', post.nodes.info).href
thumb.dataset.isVideo = true if post.file.isVideo thumb.dataset.isVideo = true if post.file.isVideo
thumbImg = post.file.thumb.cloneNode false thumbImg = post.file.thumb.cloneNode false