diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 6e57cf1fa..5613e6c61 100755
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -29,7 +29,6 @@ module.exports = (grunt) ->
return '' unless grunt.config('pkg').tests_enabled
"throw new Error 'Assertion failed: ' + `#{JSON.stringify statement}` unless #{statement}"
-
# Project configuration.
grunt.initConfig
pkg: grunt.file.readJSON 'package.json'
diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index dc9c46552..75fcd53ae 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -3349,6 +3349,7 @@
root: root,
post: post,
info: info,
+ nameBlock: $('.nameBlock', info),
comment: $('.postMessage', post),
links: [],
quotelinks: [],
@@ -3360,6 +3361,7 @@
this.thread.isClosed = !!$('.closedIcon', info);
}
this.info = {};
+ this.info.nameBlock = Conf['Anonymize'] ? 'Anonymous' : this.nodes.nameBlock.textContent.trim();
if (subject = $('.subject', info)) {
this.nodes.subject = subject;
this.info.subject = subject.textContent;
@@ -4822,16 +4824,14 @@
});
this.pagelist = $.el('div', {
className: 'pagelist',
- hidden: true,
- innerHTML: {
- innerHTML: "\r
\r"
- }
+ hidden: true
+ }, {
+ innerHTML: "\r
\r"
});
this.navLinks = $.el('div', {
- className: 'navLinks',
- innerHTML: {
- innerHTML: "\r"
- }
+ className: 'navLinks'
+ }, {
+ innerHTML: "\r"
});
this.timeEl = $('time#index-last-refresh', this.navLinks);
this.searchInput = $('#index-search', this.navLinks);
@@ -5836,9 +5836,23 @@
staticPath: '//s.4cdn.org/image/',
gifIcon: window.devicePixelRatio >= 2 ? '@2x.gif' : '.gif',
spoilerRange: {},
- shortFilename: function(filename, isReply) {
+ unescape: function(text) {
+ if (text == null) {
+ return text;
+ }
+ return text.replace(/<[^>]*>/g, '').replace(/&(amp|#039|quot|lt|gt);/g, function(c) {
+ return {
+ '&': '&',
+ ''': "'",
+ '"': '"',
+ '<': '<',
+ '>': '>'
+ }[c];
+ });
+ },
+ shortFilename: function(filename) {
var ext, threshold;
- threshold = isReply ? 30 : 40;
+ threshold = 30;
ext = filename.match(/\.[^.]+$/)[0];
if (filename.length - ext.length > threshold) {
return "" + filename.slice(0, threshold - 5) + "(...)" + ext;
@@ -5847,12 +5861,22 @@
}
},
thumbRotate: (function() {
- var n;
- n = 0;
+ var t;
+ t = 0;
return function() {
- return n = (n + 1) % 2;
+ return t = (t ? 0 : 1);
};
})(),
+ sameThread: function(boardID, threadID) {
+ return g.VIEW === 'thread' && g.BOARD.ID === boardID && g.THREADID === +threadID;
+ },
+ postURL: function(boardID, threadID, postID) {
+ if (Build.sameThread(boardID, threadID)) {
+ return "#p" + postID;
+ } else {
+ return Build.path(boardID, threadID, postID);
+ }
+ },
path: function(boardID, threadID, postID, fragment) {
var path;
path = "/" + boardID + "/thread/" + threadID;
@@ -5870,22 +5894,30 @@
postID: data.no,
threadID: data.resto || data.no,
boardID: boardID,
- name: data.name,
+ name: Build.unescape(data.name),
capcode: data.capcode,
tripcode: data.trip,
uniqueID: data.id,
- email: data.email ? encodeURI(data.email.replace(/"/g, '"')) : '',
- subject: data.sub,
+ email: Build.unescape(data.email),
+ subject: Build.unescape(data.sub),
flagCode: data.country,
- flagName: data.country_name,
+ flagName: Build.unescape(data.country_name),
date: data.now,
dateUTC: data.time,
- comment: data.com,
+ comment: {
+ innerHTML: data.com || ''
+ },
isSticky: !!data.sticky,
- isClosed: !!data.closed
+ isClosed: !!data.closed,
+ isArchived: !!data.archived
};
- if (data.ext || data.filedeleted) {
+ if (data.filedeleted) {
o.file = {
+ isDeleted: true
+ };
+ } else if (data.ext) {
+ o.file = {
+ name: (Build.unescape(data.filename)) + data.ext,
name: data.filename + data.ext,
timestamp: "" + data.tim + data.ext,
url: boardID === 'f' ? "//i.4cdn.org/" + boardID + "/" + (encodeURIComponent(data.filename)) + data.ext : "//i.4cdn.org/" + boardID + "/" + data.tim + data.ext,
@@ -5897,107 +5929,177 @@
theight: data.tn_h,
twidth: data.tn_w,
isSpoiler: !!data.spoiler,
- isDeleted: !!data.filedeleted
+ isDeleted: false,
+ tag: data.tag
};
}
return Build.post(o);
},
- post: function(o, isArchived) {
+ post: function(o) {
/*
This function contains code from 4chan-JS (https://github.com/4chan/4chan-JS).
@license: https://github.com/4chan/4chan-JS/blob/master/LICENSE
*/
- var a, boardID, capcode, capcodeClass, capcodeIcon, capcodeStart, closed, comment, container, date, dateUTC, email, emailEnd, emailStart, file, fileDims, fileHTML, fileInfo, fileSize, fileThumb, filename, flag, flagCode, flagName, gifIcon, href, imgSrc, isClosed, isOP, isSticky, name, pageIcon, pageNum, postID, quote, replyLink, shortFilename, spoilerRange, staticPath, sticky, subject, threadID, tripcode, uniqueID, userID, _i, _len, _ref;
- postID = o.postID, threadID = o.threadID, boardID = o.boardID, name = o.name, capcode = o.capcode, tripcode = o.tripcode, uniqueID = o.uniqueID, email = o.email, subject = o.subject, flagCode = o.flagCode, flagName = o.flagName, date = o.date, dateUTC = o.dateUTC, isSticky = o.isSticky, isClosed = o.isClosed, comment = o.comment, file = o.file;
+ var boardID, capcode, capcodeClass, capcodeIcon, capcodeStart, comment, container, date, dateUTC, desktop2, email, emailField, emailProcessed, file, fileBlock, fileCont, fileDims, fileLink, fileSize, fileText, fileThumb, flag, flagCode, flagName, gifIcon, highlightPost, href, icons, isOP, match, message, name, nameBlock, nameClass, postID, postInfo, postLink, quote, quoteLink, replyLink, shortFilename, spoilerRange, staticPath, subject, subjectField, threadID, tripcode, tripcodeField, type, typeLC, uniqueID, userID, wholePost, _i, _len, _ref;
+ postID = o.postID, threadID = o.threadID, boardID = o.boardID, name = o.name, capcode = o.capcode, tripcode = o.tripcode, uniqueID = o.uniqueID, email = o.email, subject = o.subject, flagCode = o.flagCode, flagName = o.flagName, date = o.date, dateUTC = o.dateUTC, comment = o.comment, file = o.file;
+ name || (name = '');
+ subject || (subject = '');
isOP = postID === threadID;
staticPath = Build.staticPath, gifIcon = Build.gifIcon;
- tripcode = tripcode ? " " + tripcode + " " : '';
- if (email) {
- emailStart = '';
- emailEnd = ' ';
- } else {
- emailStart = '';
- emailEnd = '';
- }
+
+ /* Name Block */
switch (capcode) {
case 'admin':
case 'admin_highlight':
- capcodeClass = " capcodeAdmin";
- capcodeStart = " ## Admin ";
- capcodeIcon = (" ## Admin "
+ };
+ capcodeIcon = {
+ innerHTML: " ## Mod ";
- capcodeIcon = (" ## Developer ";
- capcodeIcon = (" ## Mod "
+ };
+ capcodeIcon = {
+ innerHTML: " ## Developer "
+ };
+ capcodeIcon = {
+ innerHTML: " (ID: ") + ("" + uniqueID + " ) ") : '';
- flag = !flagCode ? '' : boardID === 'pol' ? " " + (" " + (" " + E(tripcode) + " "
+ } : {
+ innerHTML: ""
+ };
+ emailField = {
+ innerHTML: "" + E(name) + " " + tripcodeField.innerHTML + capcodeStart.innerHTML
+ };
+ if (email) {
+ emailProcessed = encodeURIComponent(email).replace(/%40/g, '@');
+ emailField = {
+ innerHTML: "" + emailField.innerHTML + " "
+ };
+ }
+ userID = !capcode && uniqueID ? {
+ innerHTML: " (ID: " + E(uniqueID) + " ) "
+ } : {
+ innerHTML: ""
+ };
+ flag = !flagCode ? {
+ innerHTML: ""
+ } : false ? {
+ innerHTML: " " + emailField.innerHTML + capcodeIcon.innerHTML + userID.innerHTML + flag.innerHTML + " "
+ };
+
+ /* Post Info */
+ subjectField = isOP || boardID === 'f' ? {
+ innerHTML: "" + E(subject) + " "
+ } : {
+ innerHTML: ""
+ };
+ desktop2 = isOP && boardID === 'f' ? '' : ' desktop';
+ postLink = Build.postURL(boardID, threadID, postID);
+ quoteLink = Build.sameThread(boardID, threadID) ? "javascript:quote('" + (+postID) + "');" : "/" + boardID + "/thread/" + threadID + "#q" + postID;
+ icons = (function() {
+ var _i, _len, _ref, _results;
+ _ref = ['Sticky', 'Closed', 'Archived'];
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ type = _ref[_i];
+ if (!(o["is" + type] && !(type === 'Closed' && o.isArchived))) {
+ continue;
}
+ typeLC = type.toLowerCase();
+ _results.push({
+ innerHTML: " ") + (" ";
- a = $.el('a', {
- innerHTML: file.name
- });
- filename = a.textContent.replace(/%22/g, '"');
- a.textContent = Build.shortFilename(filename);
- shortFilename = a.innerHTML;
- a.textContent = filename;
- filename = a.innerHTML.replace(/'/g, ''');
- fileDims = file.name.slice(-3) === 'pdf' ? 'PDF' : "" + file.width + "x" + file.height;
- fileInfo = ("");
- fileHTML = "" + fileInfo + imgSrc + "
";
- } else {
- fileHTML = '';
- }
- sticky = isSticky ? " Page " + pageNum + " ";
- replyLink = " [Reply ] ";
- } else {
- pageIcon = '';
- replyLink = '';
- }
+ return _results;
+ })();
+ replyLink = isOP && g.VIEW === 'index' ? {
+ innerHTML: " [Reply ] "
+ } : {
+ innerHTML: ""
+ };
+ postInfo = {
+ innerHTML: ""
+ };
+
+ /* File Info */
+ fileCont = (file != null ? file.isDeleted : void 0) ? {
+ innerHTML: "File: " + E(file.name) + " -(" + E($.bytesToString(file.size)) + ", " + E(file.width) + "x" + E(file.height) + ", " + E(file.tag) + ") " + E(shortFilename) + " "
+ } : {
+ innerHTML: "" + E(shortFilename) + " "
+ }, fileText = file.isSpoiler ? {
+ innerHTML: "File: " + fileLink.innerHTML + " (" + E(fileSize) + ", " + E(fileDims) + ")
"
+ } : {
+ innerHTML: "File: " + fileLink.innerHTML + " (" + E(fileSize) + ", " + E(fileDims) + ")
"
+ }, {
+ innerHTML: fileText.innerHTML + "" + fileCont.innerHTML + "
"
+ } : {
+ innerHTML: ""
+ };
+
+ /* Whole Post */
+ highlightPost = capcode === 'admin_highlight' ? ' highlightPost' : '';
+ message = {
+ innerHTML: "" + comment.innerHTML + " "
+ };
+ wholePost = isOP ? {
+ innerHTML: "" + fileBlock.innerHTML + postInfo.innerHTML + message.innerHTML + "
"
+ } : {
+ innerHTML: ">>
" + postInfo.innerHTML + fileBlock.innerHTML + message.innerHTML + "
"
+ };
container = $.el('div', {
- id: "pc" + postID,
className: "postContainer " + (isOP ? 'op' : 'reply') + "Container",
- innerHTML: (isOP ? '' : ">>
") + ("") + (isOP ? fileHTML : '') + "
" + ("
") + ("
" + (subject || '') + " ") + ("
") + emailStart + ("" + (name || '') + " ") + tripcode + capcodeStart + emailEnd + capcodeIcon + userID + flag + ' ' + ("
" + date + " ") + "
" + ("No. ") + ("" + postID + " ") + pageIcon + sticky + closed + replyLink + ' ' + '
' + (isOP ? '' : fileHTML) + ("
" + (comment || '') + " ") + '
" + thread.OP.nodes.subject.innerHTML + "
" : '';
+ subject = thread.OP.info.subject ? {
+ innerHTML: "" + E(thread.OP.nodes.subject.innerHTML) + "
"
+ } : '';
comment = thread.OP.nodes.comment.innerHTML.replace(/(\r" + postCount + " / " + fileCount + " / " + pageCount + " \r
\r" + subject + "\r\r"
- }
+ className: 'catalog-thread'
+ }, {
+ innerHTML: "\r" + postCount + " / " + fileCount + " / " + pageCount + " \r
\r" + subject + "\r\r"
});
root.dataset.fullID = thread.fullID;
if (thread.isPinned) {
@@ -6125,7 +6228,7 @@
threadExcerpt: function(thread) {
var OP, excerpt, _ref;
OP = thread.OP;
- excerpt = ((_ref = OP.info.subject) != null ? _ref.trim() : void 0) || OP.info.comment.replace(/\n+/g, ' // ') || OP.getNameBlock();
+ excerpt = ((_ref = OP.info.subject) != null ? _ref.trim() : void 0) || OP.info.comment.replace(/\n+/g, ' // ') || OP.info.nameBlock;
if (excerpt.length > 70) {
excerpt = "" + excerpt.slice(0, 67) + "...";
}
@@ -7221,7 +7324,7 @@
},
node: function() {
var a, data, label;
- if (!this.isReply && g.VIEW !== 'index' || this.isClone) {
+ if (!this.isReply || this.isClone || this.isFetchedQuote) {
return;
}
if (data = PostHiding.db.get({
@@ -7229,12 +7332,12 @@
threadID: this.thread.ID,
postID: this.ID
})) {
- if (data.thisPost === false) {
+ if (data.thisPost) {
+ this.hide('Manually hidden', data.makeStub, data.hideRecursively);
+ } else {
label = "Recursively hidden for quoting No." + this;
Recursive.apply('hide', this, label, data.makeStub, true);
Recursive.add('hide', this, label, data.makeStub, true);
- } else {
- this.hide('Manually hidden', data.makeStub, data.hideRecursively);
}
}
if (!Conf['Post Hiding']) {
@@ -7316,19 +7419,13 @@
}
};
thisPost = {
- el: $.el('label', {
- innerHTML: '\r
\r \r
\r"
- }
+ "class": 'dialog'
+ }, {
+ innerHTML: "\r
\r \r
\r"
});
Settings.overlay = overlay = $.el('div', {
id: 'overlay'
@@ -17162,9 +17258,9 @@
},
filter: function(section) {
var select;
- section.innerHTML = {
+ $.extend(section, {
innerHTML: "\rGuide \rName \rUnique ID \rTripcode \rCapcode \rE-mail \rSubject \rComment \rFlag \rFilename \rImage dimensions \rFilesize \rImage MD5 \r \r
"
- };
+ });
select = $('select', section);
$.on(select, 'change', Settings.selectFilter);
return Settings.selectFilter.call(select);
@@ -17186,15 +17282,15 @@
$.add(div, ta);
return;
}
- return div.innerHTML = {
+ return $.extend(div, {
innerHTML: "Filter is disabled.
\r\rUse regular expressions , one per line.# will be ignored./weeaboo/i will filter posts containing the string `weeaboo`, case-insensitive.
\rYou can use these settings with each regular expression, separate them with semicolons:\r\rPer boards, separate them with commas. It is global if not specified.boards:a,jp;.\r \r\rFilter OPs only along with their threads (`only`), replies only (`no`), or both (`yes`, this is default).op:only;, op:no; or op:yes;.\r \r\rOverrule the `Show Stubs` setting if specified: create a stub (`yes`) or not (`no`).stub:yes; or stub:no;.\r \r\rHighlight instead of hiding. You can specify a class name to use with a userstyle.highlight; or highlight:wallpaper;.\r \r\rHighlighted OPs will have their threads put on top of the board index by default.top:yes; or top:no;.\r \r \r"
- };
+ });
},
sauce: function(section) {
var ta;
- section.innerHTML = {
+ $.extend(section, {
innerHTML: "Sauce is disabled.
\rLines starting with a # will be ignored.
\rYou can specify a display text by appending ;text:[text] to the URL.
\rThese parameters will be replaced by their corresponding values:\r%TURL: Thumbnail URL.%URL: Full image URL.%MD5: MD5 hash.%name: Original file name.%board: Current board. \r\r"
- };
+ });
ta = $('textarea', section);
$.get('sauces', Conf['sauces'], function(item) {
return ta.value = item['sauces'].replace(/\$\d/g, function(c) {
@@ -17216,9 +17312,9 @@
},
advanced: function(section) {
var archBoards, boardID, boardOptions, boardSelect, boards, event, files, i, input, inputs, item, items, name, o, row, rows, software, ta, table, withCredentials, _i, _j, _k, _l, _len, _len1, _len2, _len3, _len4, _len5, _m, _n, _ref, _ref1, _ref2, _ref3, _ref4, _ref5;
- section.innerHTML = {
+ $.extend(section, {
innerHTML: "\rArchiver \r404 Redirect is disabled.
\r
\r\r\rThread redirection \rPost fetching \rFile redirection \r \r
\rDisabled selections indicate that only one archive is available for that board and redirection type. \r \r\rCustom Board Navigation \r
\rNew lines will be converted into spaces. In the following examples for /g/, g can be changed to a different board ID (a, b, etc...), the current board (current), or the Twitter link (@).
\rBoard link: g
\rTitle link: g-title
\rBoard link (Replace with title when on that board): g-replace
\rFull text link: g-full
\rCustom text link: g-text:\"Install Gentoo\"
\rExternal link: external-text:\"Google\",\"http://www.google.com\"
\rIndex mode: g-mode:\"type\" where type is paged, all threads or catalog
\rIndex sort: g-sort:\"type\" where type is bump order, last reply, creation date, reply count or file countCombinations are possible: g-text:\"VIP Catalog\"-mode:\"catalog\"-sort:\"creation date\"
\rFull board list toggle: toggle-all
\r\r[ toggle-all ] [current-title] [g-title / a-title / jp-title] [x / wsg / h-mode:\"catalog\"-sort:\"file count\"] [t-text:\"Piracy\"][ + ] [Technology] [Technology / Anime & Manga / Otaku Culture] [x / wsg / h] [Piracy]
\r \r\rTime Formatting is disabled. \r
\r\rDay: %a, %A, %d, %e
\rMonth: %m, %b, %B
\rYear: %y, %Y
\rHour: %k, %H, %l, %I, %p, %P
\rMinute: %M
\rSecond: %S
\r \r\rQuote Backlinks formatting is disabled. \r
\r \r\rFile Info Formatting is disabled. \r
\rLink: %l (truncated), %L (untruncated), %T (Unix timestamp)
\rOriginal file name: %n (truncated), %N (untruncated), %t (Unix timestamp)
\rSpoiler indicator: %p
\rSize: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
\rResolution: %r (Displays 'PDF' for PDF files)
\r \r\rQuick Reply Personas \r\r\rOne item per line.# will be ignored.\r
\rYou can use these settings with each item, separate them with semicolons:\rPossible items are: name, options (or equivalently email), subject and password. \rWrap values of items with quotes, like this: options:\"sage\". \rForce values as defaults with the always keyword, for example: options:\"sage\";always. \rSelect specific boards for an item, separated with commas, for example: options:\"sage\";boards:jp;always. \r \r \r\rUnread Favicon is disabled. \r\rferongr \rxat- \rMayhem \r4chanJS \rOriginal \rMetro \r \r \r\rThread Updater is disabled. \r\rInterval:
\r \r\r\rApply CSS \r\r
\r \r"
- };
+ });
items = {};
inputs = {};
_ref = ['boardnav', 'time', 'backlink', 'fileInfo', 'favicon', 'usercss'];
@@ -17413,9 +17509,9 @@
},
keybinds: function(section) {
var arr, input, inputs, items, key, tbody, tr, _ref;
- section.innerHTML = {
+ $.extend(section, {
innerHTML: "Keybinds are disabled.
\rAllowed keys: a-z , 0-9 , Ctrl , Shift , Alt , Meta , Enter , Esc , Up , Down , Right , Left .
\rPress Backspace to disable a keybind.
\r"
- };
+ });
tbody = $('tbody', section);
items = {};
inputs = {};
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 52f8afc28..23eb4321d 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -3375,6 +3375,7 @@
root: root,
post: post,
info: info,
+ nameBlock: $('.nameBlock', info),
comment: $('.postMessage', post),
links: [],
quotelinks: [],
@@ -3386,6 +3387,7 @@
this.thread.isClosed = !!$('.closedIcon', info);
}
this.info = {};
+ this.info.nameBlock = Conf['Anonymize'] ? 'Anonymous' : this.nodes.nameBlock.textContent.trim();
if (subject = $('.subject', info)) {
this.nodes.subject = subject;
this.info.subject = subject.textContent;
@@ -4851,16 +4853,14 @@
});
this.pagelist = $.el('div', {
className: 'pagelist',
- hidden: true,
- innerHTML: {
- innerHTML: "\r
\r"
- }
+ hidden: true
+ }, {
+ innerHTML: "\r
\r"
});
this.navLinks = $.el('div', {
- className: 'navLinks',
- innerHTML: {
- innerHTML: "\r"
- }
+ className: 'navLinks'
+ }, {
+ innerHTML: "\r"
});
this.timeEl = $('time#index-last-refresh', this.navLinks);
this.searchInput = $('#index-search', this.navLinks);
@@ -5865,9 +5865,23 @@
staticPath: '//s.4cdn.org/image/',
gifIcon: window.devicePixelRatio >= 2 ? '@2x.gif' : '.gif',
spoilerRange: {},
- shortFilename: function(filename, isReply) {
+ unescape: function(text) {
+ if (text == null) {
+ return text;
+ }
+ return text.replace(/<[^>]*>/g, '').replace(/&(amp|#039|quot|lt|gt);/g, function(c) {
+ return {
+ '&': '&',
+ ''': "'",
+ '"': '"',
+ '<': '<',
+ '>': '>'
+ }[c];
+ });
+ },
+ shortFilename: function(filename) {
var ext, threshold;
- threshold = isReply ? 30 : 40;
+ threshold = 30;
ext = filename.match(/\.[^.]+$/)[0];
if (filename.length - ext.length > threshold) {
return "" + filename.slice(0, threshold - 5) + "(...)" + ext;
@@ -5876,12 +5890,22 @@
}
},
thumbRotate: (function() {
- var n;
- n = 0;
+ var t;
+ t = 0;
return function() {
- return n = (n + 1) % 2;
+ return t = (t ? 0 : 1);
};
})(),
+ sameThread: function(boardID, threadID) {
+ return g.VIEW === 'thread' && g.BOARD.ID === boardID && g.THREADID === +threadID;
+ },
+ postURL: function(boardID, threadID, postID) {
+ if (Build.sameThread(boardID, threadID)) {
+ return "#p" + postID;
+ } else {
+ return Build.path(boardID, threadID, postID);
+ }
+ },
path: function(boardID, threadID, postID, fragment) {
var path;
path = "/" + boardID + "/thread/" + threadID;
@@ -5899,22 +5923,30 @@
postID: data.no,
threadID: data.resto || data.no,
boardID: boardID,
- name: data.name,
+ name: Build.unescape(data.name),
capcode: data.capcode,
tripcode: data.trip,
uniqueID: data.id,
- email: data.email ? encodeURI(data.email.replace(/"/g, '"')) : '',
- subject: data.sub,
+ email: Build.unescape(data.email),
+ subject: Build.unescape(data.sub),
flagCode: data.country,
- flagName: data.country_name,
+ flagName: Build.unescape(data.country_name),
date: data.now,
dateUTC: data.time,
- comment: data.com,
+ comment: {
+ innerHTML: data.com || ''
+ },
isSticky: !!data.sticky,
- isClosed: !!data.closed
+ isClosed: !!data.closed,
+ isArchived: !!data.archived
};
- if (data.ext || data.filedeleted) {
+ if (data.filedeleted) {
o.file = {
+ isDeleted: true
+ };
+ } else if (data.ext) {
+ o.file = {
+ name: (Build.unescape(data.filename)) + data.ext,
name: data.filename + data.ext,
timestamp: "" + data.tim + data.ext,
url: boardID === 'f' ? "//i.4cdn.org/" + boardID + "/" + (encodeURIComponent(data.filename)) + data.ext : "//i.4cdn.org/" + boardID + "/" + data.tim + data.ext,
@@ -5926,107 +5958,177 @@
theight: data.tn_h,
twidth: data.tn_w,
isSpoiler: !!data.spoiler,
- isDeleted: !!data.filedeleted
+ isDeleted: false,
+ tag: data.tag
};
}
return Build.post(o);
},
- post: function(o, isArchived) {
+ post: function(o) {
/*
This function contains code from 4chan-JS (https://github.com/4chan/4chan-JS).
@license: https://github.com/4chan/4chan-JS/blob/master/LICENSE
*/
- var a, boardID, capcode, capcodeClass, capcodeIcon, capcodeStart, closed, comment, container, date, dateUTC, email, emailEnd, emailStart, file, fileDims, fileHTML, fileInfo, fileSize, fileThumb, filename, flag, flagCode, flagName, gifIcon, href, imgSrc, isClosed, isOP, isSticky, name, pageIcon, pageNum, postID, quote, replyLink, shortFilename, spoilerRange, staticPath, sticky, subject, threadID, tripcode, uniqueID, userID, _i, _len, _ref;
- postID = o.postID, threadID = o.threadID, boardID = o.boardID, name = o.name, capcode = o.capcode, tripcode = o.tripcode, uniqueID = o.uniqueID, email = o.email, subject = o.subject, flagCode = o.flagCode, flagName = o.flagName, date = o.date, dateUTC = o.dateUTC, isSticky = o.isSticky, isClosed = o.isClosed, comment = o.comment, file = o.file;
+ var boardID, capcode, capcodeClass, capcodeIcon, capcodeStart, comment, container, date, dateUTC, desktop2, email, emailField, emailProcessed, file, fileBlock, fileCont, fileDims, fileLink, fileSize, fileText, fileThumb, flag, flagCode, flagName, gifIcon, highlightPost, href, icons, isOP, match, message, name, nameBlock, nameClass, postID, postInfo, postLink, quote, quoteLink, replyLink, shortFilename, spoilerRange, staticPath, subject, subjectField, threadID, tripcode, tripcodeField, type, typeLC, uniqueID, userID, wholePost, _i, _len, _ref;
+ postID = o.postID, threadID = o.threadID, boardID = o.boardID, name = o.name, capcode = o.capcode, tripcode = o.tripcode, uniqueID = o.uniqueID, email = o.email, subject = o.subject, flagCode = o.flagCode, flagName = o.flagName, date = o.date, dateUTC = o.dateUTC, comment = o.comment, file = o.file;
+ name || (name = '');
+ subject || (subject = '');
isOP = postID === threadID;
staticPath = Build.staticPath, gifIcon = Build.gifIcon;
- tripcode = tripcode ? " " + tripcode + " " : '';
- if (email) {
- emailStart = '';
- emailEnd = ' ';
- } else {
- emailStart = '';
- emailEnd = '';
- }
+
+ /* Name Block */
switch (capcode) {
case 'admin':
case 'admin_highlight':
- capcodeClass = " capcodeAdmin";
- capcodeStart = " ## Admin ";
- capcodeIcon = (" ## Admin "
+ };
+ capcodeIcon = {
+ innerHTML: " ## Mod ";
- capcodeIcon = (" ## Developer ";
- capcodeIcon = (" ## Mod "
+ };
+ capcodeIcon = {
+ innerHTML: " ## Developer "
+ };
+ capcodeIcon = {
+ innerHTML: " (ID: ") + ("" + uniqueID + " ) ") : '';
- flag = !flagCode ? '' : boardID === 'pol' ? " " + (" " + (" " + E(tripcode) + " "
+ } : {
+ innerHTML: ""
+ };
+ emailField = {
+ innerHTML: "" + E(name) + " " + tripcodeField.innerHTML + capcodeStart.innerHTML
+ };
+ if (email) {
+ emailProcessed = encodeURIComponent(email).replace(/%40/g, '@');
+ emailField = {
+ innerHTML: "" + emailField.innerHTML + " "
+ };
+ }
+ userID = !capcode && uniqueID ? {
+ innerHTML: " (ID: " + E(uniqueID) + " ) "
+ } : {
+ innerHTML: ""
+ };
+ flag = !flagCode ? {
+ innerHTML: ""
+ } : false ? {
+ innerHTML: " " + emailField.innerHTML + capcodeIcon.innerHTML + userID.innerHTML + flag.innerHTML + " "
+ };
+
+ /* Post Info */
+ subjectField = isOP || boardID === 'f' ? {
+ innerHTML: "" + E(subject) + " "
+ } : {
+ innerHTML: ""
+ };
+ desktop2 = isOP && boardID === 'f' ? '' : ' desktop';
+ postLink = Build.postURL(boardID, threadID, postID);
+ quoteLink = Build.sameThread(boardID, threadID) ? "javascript:quote('" + (+postID) + "');" : "/" + boardID + "/thread/" + threadID + "#q" + postID;
+ icons = (function() {
+ var _i, _len, _ref, _results;
+ _ref = ['Sticky', 'Closed', 'Archived'];
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ type = _ref[_i];
+ if (!(o["is" + type] && !(type === 'Closed' && o.isArchived))) {
+ continue;
}
+ typeLC = type.toLowerCase();
+ _results.push({
+ innerHTML: " ") + (" ";
- a = $.el('a', {
- innerHTML: file.name
- });
- filename = a.textContent.replace(/%22/g, '"');
- a.textContent = Build.shortFilename(filename);
- shortFilename = a.innerHTML;
- a.textContent = filename;
- filename = a.innerHTML.replace(/'/g, ''');
- fileDims = file.name.slice(-3) === 'pdf' ? 'PDF' : "" + file.width + "x" + file.height;
- fileInfo = ("");
- fileHTML = "" + fileInfo + imgSrc + "
";
- } else {
- fileHTML = '';
- }
- sticky = isSticky ? " Page " + pageNum + " ";
- replyLink = " [Reply ] ";
- } else {
- pageIcon = '';
- replyLink = '';
- }
+ return _results;
+ })();
+ replyLink = isOP && g.VIEW === 'index' ? {
+ innerHTML: " [Reply ] "
+ } : {
+ innerHTML: ""
+ };
+ postInfo = {
+ innerHTML: ""
+ };
+
+ /* File Info */
+ fileCont = (file != null ? file.isDeleted : void 0) ? {
+ innerHTML: "File: " + E(file.name) + " -(" + E($.bytesToString(file.size)) + ", " + E(file.width) + "x" + E(file.height) + ", " + E(file.tag) + ") " + E(shortFilename) + " "
+ } : {
+ innerHTML: "" + E(shortFilename) + " "
+ }, fileText = file.isSpoiler ? {
+ innerHTML: "File: " + fileLink.innerHTML + " (" + E(fileSize) + ", " + E(fileDims) + ")
"
+ } : {
+ innerHTML: "File: " + fileLink.innerHTML + " (" + E(fileSize) + ", " + E(fileDims) + ")
"
+ }, {
+ innerHTML: fileText.innerHTML + "" + fileCont.innerHTML + "
"
+ } : {
+ innerHTML: ""
+ };
+
+ /* Whole Post */
+ highlightPost = capcode === 'admin_highlight' ? ' highlightPost' : '';
+ message = {
+ innerHTML: "" + comment.innerHTML + " "
+ };
+ wholePost = isOP ? {
+ innerHTML: "" + fileBlock.innerHTML + postInfo.innerHTML + message.innerHTML + "
"
+ } : {
+ innerHTML: ">>
" + postInfo.innerHTML + fileBlock.innerHTML + message.innerHTML + "
"
+ };
container = $.el('div', {
- id: "pc" + postID,
className: "postContainer " + (isOP ? 'op' : 'reply') + "Container",
- innerHTML: (isOP ? '' : ">>
") + ("") + (isOP ? fileHTML : '') + "
" + ("
") + ("
" + (subject || '') + " ") + ("
") + emailStart + ("" + (name || '') + " ") + tripcode + capcodeStart + emailEnd + capcodeIcon + userID + flag + ' ' + ("
" + date + " ") + "
" + ("No. ") + ("" + postID + " ") + pageIcon + sticky + closed + replyLink + ' ' + '
' + (isOP ? '' : fileHTML) + ("
" + (comment || '') + " ") + '
" + thread.OP.nodes.subject.innerHTML + "
" : '';
+ subject = thread.OP.info.subject ? {
+ innerHTML: "" + E(thread.OP.nodes.subject.innerHTML) + "
"
+ } : '';
comment = thread.OP.nodes.comment.innerHTML.replace(/(\r" + postCount + " / " + fileCount + " / " + pageCount + " \r
\r" + subject + "\r\r"
- }
+ className: 'catalog-thread'
+ }, {
+ innerHTML: "\r" + postCount + " / " + fileCount + " / " + pageCount + " \r
\r" + subject + "\r\r"
});
root.dataset.fullID = thread.fullID;
if (thread.isPinned) {
@@ -6154,7 +6257,7 @@
threadExcerpt: function(thread) {
var OP, excerpt, _ref;
OP = thread.OP;
- excerpt = ((_ref = OP.info.subject) != null ? _ref.trim() : void 0) || OP.info.comment.replace(/\n+/g, ' // ') || OP.getNameBlock();
+ excerpt = ((_ref = OP.info.subject) != null ? _ref.trim() : void 0) || OP.info.comment.replace(/\n+/g, ' // ') || OP.info.nameBlock;
if (excerpt.length > 70) {
excerpt = "" + excerpt.slice(0, 67) + "...";
}
@@ -7266,7 +7369,7 @@
},
node: function() {
var a, data, label;
- if (!this.isReply && g.VIEW !== 'index' || this.isClone) {
+ if (!this.isReply || this.isClone || this.isFetchedQuote) {
return;
}
if (data = PostHiding.db.get({
@@ -7274,12 +7377,12 @@
threadID: this.thread.ID,
postID: this.ID
})) {
- if (data.thisPost === false) {
+ if (data.thisPost) {
+ this.hide('Manually hidden', data.makeStub, data.hideRecursively);
+ } else {
label = "Recursively hidden for quoting No." + this;
Recursive.apply('hide', this, label, data.makeStub, true);
Recursive.add('hide', this, label, data.makeStub, true);
- } else {
- this.hide('Manually hidden', data.makeStub, data.hideRecursively);
}
}
if (!Conf['Post Hiding']) {
@@ -7361,19 +7464,13 @@
}
};
thisPost = {
- el: $.el('label', {
- innerHTML: '\r
\r \r
\r"
- }
+ "class": 'dialog'
+ }, {
+ innerHTML: "\r
\r \r
\r"
});
Settings.overlay = overlay = $.el('div', {
id: 'overlay'
@@ -17183,9 +17279,9 @@
},
filter: function(section) {
var select;
- section.innerHTML = {
+ $.extend(section, {
innerHTML: "\rGuide \rName \rUnique ID \rTripcode \rCapcode \rE-mail \rSubject \rComment \rFlag \rFilename \rImage dimensions \rFilesize \rImage MD5 \r \r
"
- };
+ });
select = $('select', section);
$.on(select, 'change', Settings.selectFilter);
return Settings.selectFilter.call(select);
@@ -17207,15 +17303,15 @@
$.add(div, ta);
return;
}
- return div.innerHTML = {
+ return $.extend(div, {
innerHTML: "Filter is disabled.
\r\rUse regular expressions , one per line.# will be ignored./weeaboo/i will filter posts containing the string `weeaboo`, case-insensitive.
\rYou can use these settings with each regular expression, separate them with semicolons:\r\rPer boards, separate them with commas. It is global if not specified.boards:a,jp;.\r \r\rFilter OPs only along with their threads (`only`), replies only (`no`), or both (`yes`, this is default).op:only;, op:no; or op:yes;.\r \r\rOverrule the `Show Stubs` setting if specified: create a stub (`yes`) or not (`no`).stub:yes; or stub:no;.\r \r\rHighlight instead of hiding. You can specify a class name to use with a userstyle.highlight; or highlight:wallpaper;.\r \r\rHighlighted OPs will have their threads put on top of the board index by default.top:yes; or top:no;.\r \r \r"
- };
+ });
},
sauce: function(section) {
var ta;
- section.innerHTML = {
+ $.extend(section, {
innerHTML: "Sauce is disabled.
\rLines starting with a # will be ignored.
\rYou can specify a display text by appending ;text:[text] to the URL.
\rThese parameters will be replaced by their corresponding values:\r%TURL: Thumbnail URL.%URL: Full image URL.%MD5: MD5 hash.%name: Original file name.%board: Current board. \r\r"
- };
+ });
ta = $('textarea', section);
$.get('sauces', Conf['sauces'], function(item) {
return ta.value = item['sauces'].replace(/\$\d/g, function(c) {
@@ -17237,9 +17333,9 @@
},
advanced: function(section) {
var archBoards, boardID, boardOptions, boardSelect, boards, event, files, i, input, inputs, item, items, name, o, row, rows, software, ta, table, withCredentials, _i, _j, _k, _l, _len, _len1, _len2, _len3, _len4, _len5, _m, _n, _ref, _ref1, _ref2, _ref3, _ref4, _ref5;
- section.innerHTML = {
+ $.extend(section, {
innerHTML: "\rArchiver \r404 Redirect is disabled.
\r
\r\r\rThread redirection \rPost fetching \rFile redirection \r \r
\rDisabled selections indicate that only one archive is available for that board and redirection type. \r \r\rCustom Board Navigation \r
\rNew lines will be converted into spaces. In the following examples for /g/, g can be changed to a different board ID (a, b, etc...), the current board (current), or the Twitter link (@).
\rBoard link: g
\rTitle link: g-title
\rBoard link (Replace with title when on that board): g-replace
\rFull text link: g-full
\rCustom text link: g-text:\"Install Gentoo\"
\rExternal link: external-text:\"Google\",\"http://www.google.com\"
\rIndex mode: g-mode:\"type\" where type is paged, all threads or catalog
\rIndex sort: g-sort:\"type\" where type is bump order, last reply, creation date, reply count or file countCombinations are possible: g-text:\"VIP Catalog\"-mode:\"catalog\"-sort:\"creation date\"
\rFull board list toggle: toggle-all
\r\r[ toggle-all ] [current-title] [g-title / a-title / jp-title] [x / wsg / h-mode:\"catalog\"-sort:\"file count\"] [t-text:\"Piracy\"][ + ] [Technology] [Technology / Anime & Manga / Otaku Culture] [x / wsg / h] [Piracy]
\r \r\rTime Formatting is disabled. \r
\r\rDay: %a, %A, %d, %e
\rMonth: %m, %b, %B
\rYear: %y, %Y
\rHour: %k, %H, %l, %I, %p, %P
\rMinute: %M
\rSecond: %S
\r \r\rQuote Backlinks formatting is disabled. \r
\r \r\rFile Info Formatting is disabled. \r
\rLink: %l (truncated), %L (untruncated), %T (Unix timestamp)
\rOriginal file name: %n (truncated), %N (untruncated), %t (Unix timestamp)
\rSpoiler indicator: %p
\rSize: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
\rResolution: %r (Displays 'PDF' for PDF files)
\r \r\rQuick Reply Personas \r\r\rOne item per line.# will be ignored.\r
\rYou can use these settings with each item, separate them with semicolons:\rPossible items are: name, options (or equivalently email), subject and password. \rWrap values of items with quotes, like this: options:\"sage\". \rForce values as defaults with the always keyword, for example: options:\"sage\";always. \rSelect specific boards for an item, separated with commas, for example: options:\"sage\";boards:jp;always. \r \r \r\rUnread Favicon is disabled. \r\rferongr \rxat- \rMayhem \r4chanJS \rOriginal \rMetro \r \r \r\rThread Updater is disabled. \r\rInterval:
\r \r\r\rApply CSS \r\r
\r \r"
- };
+ });
items = {};
inputs = {};
_ref = ['boardnav', 'time', 'backlink', 'fileInfo', 'favicon', 'usercss'];
@@ -17434,9 +17530,9 @@
},
keybinds: function(section) {
var arr, input, inputs, items, key, tbody, tr, _ref;
- section.innerHTML = {
+ $.extend(section, {
innerHTML: "Keybinds are disabled.
\rAllowed keys: a-z , 0-9 , Ctrl , Shift , Alt , Meta , Enter , Esc , Up , Down , Right , Left .
\rPress Backspace to disable a keybind.
\r"
- };
+ });
tbody = $('tbody', section);
items = {};
inputs = {};
diff --git a/src/Filtering/PostHiding.coffee b/src/Filtering/PostHiding.coffee
index 1037ac87a..9a69c12ea 100644
--- a/src/Filtering/PostHiding.coffee
+++ b/src/Filtering/PostHiding.coffee
@@ -15,15 +15,15 @@ PostHiding =
cb: @node
node: ->
- return if !@isReply and g.VIEW isnt 'index' or @isClone
+ return if !@isReply or @isClone or @isFetchedQuote
if data = PostHiding.db.get {boardID: @board.ID, threadID: @thread.ID, postID: @ID}
- if data.thisPost is false
+ if data.thisPost
+ @hide 'Manually hidden', data.makeStub, data.hideRecursively
+ else
label = "Recursively hidden for quoting No.#{@}"
Recursive.apply 'hide', @, label, data.makeStub, true
Recursive.add 'hide', @, label, data.makeStub, true
- else
- @hide 'Manually hidden', data.makeStub, data.hideRecursively
return unless Conf['Post Hiding']
if @isReply
@@ -83,12 +83,9 @@ PostHiding =
@cb = -> PostHiding.menu.hide post
$.on @el, 'click', @cb
true
- thisPost =
- el: $.el 'label', innerHTML: '#{tripcode} "
- else
- ''
-
- if email
- emailStart = ''
- emailEnd = ' '
- else
- emailStart = ''
- emailEnd = ''
+ ### Name Block ###
switch capcode
when 'admin', 'admin_highlight'
- capcodeClass = " capcodeAdmin"
- capcodeStart = " ## Admin "
- capcodeIcon = " ## Admin ') %>
+ capcodeIcon = <%= html(' ## Mod "
- capcodeIcon = " ## Developer "
- capcodeIcon = " ## Mod ') %>
+ capcodeIcon = <%= html(' ## Developer ') %>
+ capcodeIcon = <%= html(' (ID: " +
- "#{uniqueID} ) "
- else
- ''
+ nameClass = if capcode then ' capcode' else ''
+
+ tripcodeField = if tripcode
+ <%= html(' ${tripcode} ') %>
+ else
+ <%= html('') %>
+
+ emailField = <%= html('${name} &{tripcodeField}&{capcodeStart}') %>
+ if email
+ emailProcessed = encodeURIComponent(email).replace /%40/g, '@'
+ emailField = <%= html('&{emailField} ') %>
+
+ userID = if !capcode and uniqueID
+ <%= html(' (ID: ${uniqueID} ) ') %>
+ else
+ <%= html('') %>
flag = unless flagCode
- ''
- else if boardID is 'pol'
- " " +
- " " +
- " ' +
+ '&{emailField}&{capcodeIcon}&{userID}&{flag}' +
+ ' '
+ ) %>
+
+ ### Post Info ###
+
+ subjectField = if isOP or boardID is 'f'
+ <%= html('${subject} ') %>
+ else
+ <%= html('') %>
+
+ desktop2 = if isOP and boardID is 'f' then '' else ' desktop'
+
+ postLink = Build.postURL boardID, threadID, postID
+ quoteLink = if Build.sameThread boardID, threadID
+ "javascript:quote('#{+postID}');"
+ else
+ "/#{boardID}/thread/#{threadID}#q#{postID}"
+
+ icons = for type in ['Sticky', 'Closed', 'Archived'] when o["is#{type}"] and !(type is 'Closed' and o.isArchived)
+ typeLC = type.toLowerCase()
+ <%= html(' [Reply ] ') %>
+ else
+ <%= html('') %>
+
+ postInfo = <%= html(
+ '' +
+ '
' +
+ '&{subjectField}' +
+ '&{nameBlock}' +
+ '
${date} ' +
+ '
' +
+ 'No. ' +
+ '${postID} ' +
+ '@{icons}&{replyLink}' +
+ ' ' +
+ '
' +
+ ' '
+ ) %>
+ else if file and boardID is 'f'
+ <%= html(
+ '' +
+ 'File: ${file.name} ' +
+ '-(${$.bytesToString(file.size)}, ${file.width}x${file.height}, ${file.tag})' +
+ ' " +
- " "
+ shortFilename = Build.shortFilename file.name, !isOP
+ fileThumb = file.turl
- # html -> text, translate WebKit's %22s into "s
- a = $.el 'a', innerHTML: file.name
- filename = a.textContent.replace /%22/g, '"'
- # shorten filename, get html
- a.textContent = Build.shortFilename filename
- shortFilename = a.innerHTML
- # get html
- a.textContent = filename
- filename = a.innerHTML.replace /'/g, '''
+ fileSize = $.bytesToString file.size
+ fileDims = if file.url[-4..] is '.pdf' then 'PDF' else "#{file.width}x#{file.height}"
- fileDims = if file.name[-3..] is 'pdf' then 'PDF' else "#{file.width}x#{file.height}"
- fileInfo = ""
+ fileLink = if file.isSpoiler or file.name is shortFilename
+ <%= html('${shortFilename} ') %>
+ else
+ <%= html('${shortFilename} ') %>
- fileHTML = "#{fileInfo}#{imgSrc}
"
+ fileText = if file.isSpoiler
+ <%= html('File: &{fileLink} (${fileSize}, ${fileDims})
') %>
+ else
+ <%= html('File: &{fileLink} (${fileSize}, ${fileDims})
') %>
+
+ <%= html(
+ '&{fileText}' +
+ '' +
+ ' '
+ ) %>
+
+ fileBlock = if file
+ <%= html('&{fileCont}
') %>
else
- fileHTML = ''
+ <%= html('') %>
- sticky = if isSticky
- " Page #{pageNum} "
- replyLink = " [Reply ] "
+ highlightPost = if capcode is 'admin_highlight' then ' highlightPost' else ''
+
+ message = <%= html('&{comment} ') %>
+
+ wholePost = if isOP
+ <%= html(
+ '' +
+ '&{fileBlock}&{postInfo}&{message}' +
+ '
'
+ ) %>
else
- pageIcon = ''
- replyLink = ''
+ <%= html(
+ '>>
' +
+ '' +
+ '&{postInfo}&{fileBlock}&{message}' +
+ '
'
+ ) %>
container = $.el 'div',
- id: "pc#{postID}"
className: "postContainer #{if isOP then 'op' else 'reply'}Container"
- innerHTML: \
- (if isOP then '' else ">>
") +
- "" +
+ id: "pc#{postID}"
+ $.extend container, wholePost
- (if isOP then fileHTML else '') +
-
- "
" +
- "
" +
- "
#{subject or ''} " +
- "
" +
- emailStart +
- "#{name or ''} " + tripcode +
- capcodeStart + emailEnd + capcodeIcon + userID + flag +
- ' ' +
- "
#{date} " +
- "
" +
- "No. " +
- "#{postID} " +
- pageIcon + sticky + closed + replyLink +
- ' ' +
- '
' +
-
- (if isOP then '' else fileHTML) +
-
- "
#{comment or ''} " +
-
- '
#{thread.OP.nodes.subject.innerHTML}
"
+ <%= html("${thread.OP.nodes.subject.innerHTML}
") %>
else
''
comment = thread.OP.nodes.comment.innerHTML.replace /( ![](" + staticPath + "country/troll/" + (flagCode.toLowerCase()) + ".gif "\" + flagName + \"")
" : " ";
- if (file != null ? file.isDeleted : void 0) {
- fileHTML = isOP ? "}.gif "#{flagName}")
"
+ <%= html('') %>
+ else if false
+ <%= html(' }.gif "${flagName}")
') %>
else
- " "
+ <%= html(' ') %>
- if file?.isDeleted
- fileHTML = if isOP
- "