Merge branch 'bstable'

This commit is contained in:
ccd0 2019-03-31 23:04:28 -07:00
commit b332ef32cc
4 changed files with 16 additions and 3 deletions

View File

@ -27,6 +27,11 @@
### v1.14.5
**v1.14.5.15** *(2019-04-01)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.5.15/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.5.15/builds/4chan-X-noupdate.crx)]
- Show info relating to April 2019 event. #2266
- Override 4chan CSS causing sauce links to get cut off. #2193
- Unbreak warning in Chrome extension to reload the page after an update.
**v1.14.5.14** *(2019-03-22)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.5.14/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.5.14/builds/4chan-X-noupdate.crx)]
- Add message alerting Chrome extension users to disable chrome://flags/#network-service
- Minor bugfix in catalog/index loading.

View File

@ -44,7 +44,6 @@ Build =
isArchived: !!data.archived
# file status
fileDeleted: !!data.filedeleted
xa18: data.xa18
o.info =
subject: Build.unescape data.sub
email: Build.unescape data.email
@ -80,6 +79,9 @@ Build =
tag: data.tag
hasDownscale: !!data.m_img
o.file.dimensions = "#{o.file.width}x#{o.file.height}" unless /\.pdf$/.test o.file.url
# Temporary JSON properties for events such as April 1 / Halloween
for key of data when key[0] is 'x'
o[key] = data[key]
o
parseComment: (html) ->

View File

@ -5,9 +5,9 @@
?{email}{<a href="mailto:${encodeURIComponent(email).replace(/%40/g, "@")}" class="useremail">}
<span class="name?{capcode}{ capcode}">${name}</span>
?{tripcode}{ <span class="postertrip">${tripcode}</span>}
?{o.xa19s}{<span class="like-score">${o.xa19s}</span>}
?{pass}{ <span title="Pass user since ${pass}" class="n-pu"></span>}
?{capcode}{ <strong class="capcode hand id_${capcodeLC}" title="Highlight posts by ${capcodePlural}">## ${capcode}</strong>}
?{!capcode && typeof o.xa18 !== "undefined"}{ <strong class="capcode hand n-atb n-atb-${o.xa18} id_at${o.xa18}"></strong>}
?{email}{</a>}
?{boardID === "f" && !o.isReply || capcodeDescription}{}{ }
?{capcodeDescription}{ <img src="${staticPath}${capcodeLC}icon${gifIcon}" alt="${capcode} Icon" title="This user is ${capcodeDescription}." class="identityIcon retina">}
@ -19,6 +19,7 @@
<span class="postNum?{!(boardID === "f" && !o.isReply)}{ desktop}">
<a href="${postLink}" title="Link to this post">No.</a>
<a href="${quoteLink}" title="Reply to this post">${ID}</a>
?{o.isReply}{<a data-cmd="like-post" href="#" class="like-btn">Like!?{o.xa19l}{ ×${o.xa19l}}</a>}
?{o.isSticky}{ <img src="${staticPath}sticky${gifIcon}" alt="Sticky" title="Sticky"?{boardID === "f"}{ style="height: 18px; width: 18px;"}{ class="stickyIcon retina"}>}
?{o.isClosed && !o.isArchived}{ <img src="${staticPath}closed${gifIcon}" alt="Closed" title="Closed"?{boardID === "f"}{ style="height: 18px; width: 18px;"}{ class="closedIcon retina"}>}
?{o.isArchived}{ <img src="${staticPath}archived${gifIcon}" alt="Archived" title="Archived" class="archivedIcon retina">}

View File

@ -833,7 +833,12 @@ QR =
QR.cleanNotifications()
if Conf['Posting Success Notifications']
QR.notifications.push new Notice 'success', h1.textContent, 5
{textContent} = h1
timeout = 5
if (xa19 = @response.firstChild.textContent.match(/xa19:(.*):xa19/))
textContent += " (score/perks: #{xa19[1]})"
timeout = 20
QR.notifications.push new Notice 'success', textContent, timeout
QR.cooldown.add threadID, postID