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

Merge branch 'master' into v3

Browse Source
This commit is contained in:
Nicolas Stepien 2012-10-13 17:58:30 +02:00
commit 242eadd028
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
4chan_x.user.js
View File

@ -907,7 +907,7 @@
} }
flag = flagCode ? (" <img src='" + staticPath + "/image/country/" + (board === 'pol' ? 'troll/' : '')) + flagCode.toLowerCase() + (".gif' alt=" + flagCode + " title='" + flagName + "' class=countryFlag>") : ''; flag = flagCode ? (" <img src='" + staticPath + "/image/country/" + (board === 'pol' ? 'troll/' : '')) + flagCode.toLowerCase() + (".gif' alt=" + flagCode + " title='" + flagName + "' class=countryFlag>") : '';
if (file != null ? file.isDeleted : void 0) { if (file != null ? file.isDeleted : void 0) {
fileHTML = isOP ? ("<div id=f" + postID + " class=file><div class=fileInfo></div><span class=fileThumb>") + ("<img src='" + staticPath + "/image/filedeleted.gif' alt='File deleted.'>") + "</span></div>" : ("<div id=f" + postID + " class=file><span class=fileThumb>") + ("<img src='" + staticPath + "/image/filedeleted-res.gif' alt='File deleted.'>") + "</span></div>"; fileHTML = isOP ? ("<div id=f" + postID + " class=file><div class=fileInfo></div><span class=fileThumb>") + ("<img src='" + staticPath + "/image/filedeleted.gif' alt='File deleted.' class='fileDeleted retina'>") + "</span></div>" : ("<div id=f" + postID + " class=file><span class=fileThumb>") + ("<img src='" + staticPath + "/image/filedeleted-res.gif' alt='File deleted.' class='fileDeletedRes retina'>") + "</span></div>";
} else if (file) { } else if (file) {
ext = file.name.slice(-3); ext = file.name.slice(-3);
if (!file.twidth && !file.theight && ext === 'gif') { if (!file.twidth && !file.theight && ext === 'gif') {

11
changelog
View File

@ -8,6 +8,17 @@ alpha
master master
2.36.0
- Mayhem
Added thread creation QR cooldown.
Fix QR cooldown timer between non-sage and sage posts. You can submit a non-sage post 30 seconds after a sage one.
Fix /q/ QR cooldowns for image and sage posts.
2.35.4
- Mayhem
Removed the obnoxious 4chan Pass ad in captcha errors when posting.
Fix 'Administrator/Moderator/Developer Replies' creating extra backlinks on /q/, again.
2.35.3 2.35.3
- Mayhem - Mayhem
Larger Comment text input by default for 4chan Pass users and on /f/ (no captcha). Larger Comment text input by default for 4chan Pass users and on /f/ (no captcha).

2
latest.js
View File

@ -1 +1 @@
postMessage({version:'2.35.3'},'*') postMessage({version:'2.36.0'},'*')

4
src/features.coffee
View File

@ -189,11 +189,11 @@ Build =
fileHTML = fileHTML =
if isOP if isOP
"<div id=f#{postID} class=file><div class=fileInfo></div><span class=fileThumb>" + "<div id=f#{postID} class=file><div class=fileInfo></div><span class=fileThumb>" +
"<img src='#{staticPath}/image/filedeleted.gif' alt='File deleted.'>" + "<img src='#{staticPath}/image/filedeleted.gif' alt='File deleted.' class='fileDeleted retina'>" +
"</span></div>" "</span></div>"
else else
"<div id=f#{postID} class=file><span class=fileThumb>" + "<div id=f#{postID} class=file><span class=fileThumb>" +
"<img src='#{staticPath}/image/filedeleted-res.gif' alt='File deleted.'>" + "<img src='#{staticPath}/image/filedeleted-res.gif' alt='File deleted.' class='fileDeletedRes retina'>" +
"</span></div>" "</span></div>"
else if file else if file
ext = file.name[-3..] ext = file.name[-3..]