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

merge master

Browse Source
This commit is contained in:
James Campos 2012-02-05 01:43:04 -08:00
commit 653e413ebc
5 changed files with 339 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

318
4chan_x.user.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan x // @name 4chan x
// @version 2.25.3 // @version 2.25.5
// @namespace aeosynth // @namespace aeosynth
// @description Adds various features. // @description Adds various features.
// @copyright 2009-2011 James Campos <james.r.campos@gmail.com> // @copyright 2009-2011 James Campos <james.r.campos@gmail.com>
@ -19,7 +19,7 @@
* Copyright (c) 2009-2011 James Campos <james.r.campos@gmail.com> * Copyright (c) 2009-2011 James Campos <james.r.campos@gmail.com>
* Copyright (c) 2012 Nicolas Stepien <stepien.nicolas@gmail.com> * Copyright (c) 2012 Nicolas Stepien <stepien.nicolas@gmail.com>
* http://mayhemydg.github.com/4chan-x/ * http://mayhemydg.github.com/4chan-x/
* 4chan X 2.25.3 * 4chan X 2.25.5
* *
* Permission is hereby granted, free of charge, to any person * Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation * obtaining a copy of this software and associated documentation
@ -117,7 +117,8 @@
'Persistent QR': [false, 'The Quick reply won\'t disappear after posting.'], 'Persistent QR': [false, 'The Quick reply won\'t disappear after posting.'],
'Auto Hide QR': [true, 'Automatically hide the quick reply when posting.'], 'Auto Hide QR': [true, 'Automatically hide the quick reply when posting.'],
'Remember Subject': [false, 'Remember the subject field, instead of resetting after posting.'], 'Remember Subject': [false, 'Remember the subject field, instead of resetting after posting.'],
'Remember Spoiler': [false, 'Remember the spoiler state, instead of resetting after posting.'] 'Remember Spoiler': [false, 'Remember the spoiler state, instead of resetting after posting.'],
'Hide Original Post Form': [true, 'Replace the normal post form with a shortcut to open the QR.']
}, },
Quoting: { Quoting: {
'Quote Backlinks': [true, 'Add quote backlinks'], 'Quote Backlinks': [true, 'Add quote backlinks'],
@ -140,33 +141,33 @@
filesize: '', filesize: '',
md5: '' md5: ''
}, },
flavors: ['http://iqdb.org/?url=', 'http://google.com/searchbyimage?image_url=', '#http://tineye.com/search?url=', '#http://saucenao.com/search.php?db=999&url=', '#http://3d.iqdb.org/?url=', '#http://regex.info/exif.cgi?imgurl=', '#http://imgur.com/upload?url=', '#http://ompldr.org/upload?url1='].join('\n'), sauces: ['http://iqdb.org/?url=$1', 'http://www.google.com/searchbyimage?image_url=$1', '#http://tineye.com/search?url=$1', '#http://saucenao.com/search.php?db=999&url=$1', '#http://3d.iqdb.org/?url=$1', '#http://regex.info/exif.cgi?imgurl=$2', '# uploaders:', '#http://imgur.com/upload?url=$2', '#http://ompldr.org/upload?url1=$2', '# "View Same" in archives:', '#http://archive.foolz.us/a/image/$3/', '#http://archive.installgentoo.net/g/image/$3'].join('\n'),
time: '%m/%d/%y(%a)%H:%M', time: '%m/%d/%y(%a)%H:%M',
backlink: '>>%id', backlink: '>>%id',
favicon: 'ferongr', favicon: 'ferongr',
hotkeys: { hotkeys: {
openOptions: 'ctrl+o', openOptions: ['ctrl+o', 'Open Options'],
close: 'Esc', close: ['Esc', 'Close Options or QR'],
spoiler: 'ctrl+s', spoiler: ['ctrl+s', 'Quick spoiler'],
openQR: 'i', openQR: ['i', 'Open QR with post number inserted'],
openEmptyQR: 'I', openEmptyQR: ['I', 'Open QR without post number inserted'],
submit: 'alt+s', submit: ['alt+s', 'Submit post'],
nextReply: 'J', nextReply: ['J', 'Select next reply'],
previousReply: 'K', previousReply: ['K', 'Select previous reply'],
nextThread: 'n', nextThread: ['n', 'See next thread'],
previousThread: 'p', previousThread: ['p', 'See previous thread'],
nextPage: 'L', nextPage: ['L', 'Jump to the next page'],
previousPage: 'H', previousPage: ['H', 'Jump to the previous page'],
zero: '0', zero: ['0', 'Jump to page 0'],
openThreadTab: 'o', openThreadTab: ['o', 'Open thread in current tab'],
openThread: 'O', openThread: ['O', 'Open thread in new tab'],
expandThread: 'e', expandThread: ['e', 'Expand thread'],
watch: 'w', watch: ['w', 'Watch thread'],
hide: 'x', hide: ['x', 'Hide thread'],
expandImages: 'm', expandImages: ['m', 'Expand selected image'],
expandAllImages: 'M', expandAllImages: ['M', 'Expand all images'],
update: 'u', update: ['u', 'Update now'],
unreadCountTo0: 'z' unreadCountTo0: ['z', 'Reset unread count to 0']
}, },
updater: { updater: {
checkbox: { checkbox: {
@ -185,19 +186,17 @@
(flatten = function(parent, obj) { (flatten = function(parent, obj) {
var key, val, _results; var key, val, _results;
if (obj.length) { if (typeof obj === 'object') {
if (typeof obj[0] === 'boolean') { if (obj.length) {
return conf[parent] = obj[0]; return conf[parent] = obj[0];
} else { } else {
return conf[parent] = obj; _results = [];
for (key in obj) {
val = obj[key];
_results.push(flatten(key, val));
}
return _results;
} }
} else if (typeof obj === 'object') {
_results = [];
for (key in obj) {
val = obj[key];
_results.push(flatten(key, val));
}
return _results;
} else { } else {
return conf[parent] = obj; return conf[parent] = obj;
} }
@ -205,7 +204,7 @@
NAMESPACE = '4chan_x.'; NAMESPACE = '4chan_x.';
VERSION = '2.25.3'; VERSION = '2.25.5';
SECOND = 1000; SECOND = 1000;
@ -306,7 +305,6 @@
val = properties[key]; val = properties[key];
object[key] = val; object[key] = val;
} }
return object;
}; };
$.extend($, { $.extend($, {
@ -409,14 +407,12 @@
return el.parentNode.removeChild(el); return el.parentNode.removeChild(el);
}, },
add: function() { add: function() {
var child, children, parent, _i, _len, _results; var child, children, parent, _i, _len;
parent = arguments[0], children = 2 <= arguments.length ? __slice.call(arguments, 1) : []; parent = arguments[0], children = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
_results = [];
for (_i = 0, _len = children.length; _i < _len; _i++) { for (_i = 0, _len = children.length; _i < _len; _i++) {
child = children[_i]; child = children[_i];
_results.push(parent.appendChild(child)); parent.appendChild(child);
} }
return _results;
}, },
prepend: function(parent, child) { prepend: function(parent, child) {
return parent.insertBefore(child, parent.firstChild); return parent.insertBefore(child, parent.firstChild);
@ -1200,13 +1196,17 @@
qr = { qr = {
init: function() { init: function() {
var h1, iframe; var form, iframe, link, loadChecking;
if (!$.id('recaptcha_challenge_field_holder')) return; if (!$.id('recaptcha_challenge_field_holder')) return;
h1 = $.el('h1', { if (conf['Hide Original Post Form']) {
innerHTML: '<a href=javascript:;>Open the Quick Reply</a>' link = $.el('h1', {
}); innerHTML: "<a href=javascript:;>" + (g.REPLY ? 'Open the Quick Reply' : 'Create a New Thread') + "</a>"
$.on($('a', h1), 'click', qr.open); });
$.add($('.postarea'), h1); $.on($('a', link), 'click', qr.open);
form = d.forms[0];
form.hidden = true;
$.before(form, link);
}
g.callbacks.push(function(root) { g.callbacks.push(function(root) {
return $.on($('.quotejs + .quotejs', root), 'click', qr.quote); return $.on($('.quotejs + .quotejs', root), 'click', qr.quote);
}); });
@ -1218,14 +1218,16 @@
$.on(iframe, 'error', function() { $.on(iframe, 'error', function() {
return this.src = this.src; return this.src = this.src;
}); });
$.on(iframe, 'load', function() { loadChecking = function(iframe) {
var _this = this; if (!qr.status.ready) {
if (!(qr.status.ready || this.src === 'about:blank')) { iframe.src = 'about:blank';
this.src = 'about:blank';
return setTimeout((function() { return setTimeout((function() {
return _this.src = 'http://sys.4chan.org/post'; return iframe.src = 'http://sys.4chan.org/post';
}), 250); }), 250);
} }
};
$.on(iframe, 'load', function() {
if (this.src !== 'about:blank') return setTimeout(loadChecking, 250, this);
}); });
$.add(d.body, iframe); $.add(d.body, iframe);
if (conf['Persistent QR']) { if (conf['Persistent QR']) {
@ -1352,11 +1354,9 @@
} }
ta = $('textarea', qr.el); ta = $('textarea', qr.el);
caretPos = ta.selectionStart; caretPos = ta.selectionStart;
ta.value = ta.value.slice(0, caretPos) + text + ta.value.slice(ta.selectionEnd, ta.value.length); qr.selected.el.lastChild.textContent = qr.selected.com = ta.value = ta.value.slice(0, caretPos) + text + ta.value.slice(ta.selectionEnd, ta.value.length);
ta.focus(); ta.focus();
ta.selectionEnd = ta.selectionStart = caretPos + text.length; return ta.selectionEnd = ta.selectionStart = caretPos + text.length;
qr.selected.com = ta.value;
return qr.selected.el.lastChild.textContent = ta.value;
}, },
fileDrop: function(e) { fileDrop: function(e) {
if (/TEXTAREA|INPUT/.test(e.target.nodeName)) return; if (/TEXTAREA|INPUT/.test(e.target.nodeName)) return;
@ -1538,9 +1538,16 @@
return this.input.value = null; return this.input.value = null;
}, },
count: function(count) { count: function(count) {
var s; this.input.placeholder = (function() {
s = count === 1 ? '' : 's'; switch (count) {
this.input.placeholder = "Verification (" + count + " cached captcha" + s + ")"; case 0:
return 'Verification (Shift + Enter to cache)';
case 1:
return 'Vertification (1 cached captcha)';
default:
return "Verification (" + count + " cached captchas)";
}
})();
return this.input.alt = count; return this.input.alt = count;
}, },
reload: function(focus) { reload: function(focus) {
@ -1561,15 +1568,15 @@
} }
}, },
dialog: function() { dialog: function() {
var e, fileInput, input, mimeTypes, spoiler, thread, threads, _i, _j, _len, _len2, _ref, _ref2; var e, fileInput, input, mimeTypes, name, spoiler, thread, threads, _i, _j, _len, _len2, _ref, _ref2;
qr.el = ui.dialog('qr', 'top:0;right:0;', '\ qr.el = ui.dialog('qr', 'top:0;right:0;', '\
<div class=move>\ <div class=move>\
Quick Reply <input type=checkbox id=autohide title=Auto-hide>\ Quick Reply <input type=checkbox id=autohide title=Auto-hide>\
<span> <a class=close>x</a></span>\ <span> <a class=close title=Close>x</a></span>\
</div>\ </div>\
<form>\ <form>\
<div><input id=dump class=field type=button title="Dump list" value=+><input name=name title=Name placeholder=Name class=field size=1><input name=email title=E-mail placeholder=E-mail class=field size=1><input name=sub title=Subject placeholder=Subject class=field size=1></div>\ <div><input id=dump class=field type=button title="Dump list" value=+><input name=name title=Name placeholder=Name class=field size=1><input name=email title=E-mail placeholder=E-mail class=field size=1><input name=sub title=Subject placeholder=Subject class=field size=1></div>\
<div id=replies><div><a id=addReply href=javascript:;>+</a></div></div>\ <div id=replies><div><a id=addReply href=javascript:; title="Add a reply">+</a></div></div>\
<div><textarea name=com title=Comment placeholder=Comment class=field></textarea></div>\ <div><textarea name=com title=Comment placeholder=Comment class=field></textarea></div>\
<div class=captcha title=Reload><img></div>\ <div class=captcha title=Reload><img></div>\
<div><input title=Verification class=field autocomplete=off size=1></div>\ <div><input title=Verification class=field autocomplete=off size=1></div>\
@ -1602,7 +1609,8 @@
threads += "<option value=" + thread.id + ">Thread " + thread.id + "</option>"; threads += "<option value=" + thread.id + ">Thread " + thread.id + "</option>";
} }
$.prepend($('.move > span', qr.el), $.el('select', { $.prepend($('.move > span', qr.el), $.el('select', {
innerHTML: threads innerHTML: threads,
title: 'Create a new thread / Reply to a thread'
})); }));
$.on($('select', qr.el), 'mousedown', function(e) { $.on($('select', qr.el), 'mousedown', function(e) {
return e.stopPropagation(); return e.stopPropagation();
@ -1628,8 +1636,12 @@
new qr.reply().select(); new qr.reply().select();
_ref2 = ['name', 'email', 'sub', 'com']; _ref2 = ['name', 'email', 'sub', 'com'];
for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) { for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) {
input = _ref2[_j]; name = _ref2[_j];
$.on($("[name=" + input + "]", qr.el), 'keyup', function() { input = $("[name=" + name + "]", qr.el);
$.on(input, 'keyup', function() {
return qr.selected[this.name] = this.value;
});
$.on(input, 'change', function() {
return qr.selected[this.name] = this.value; return qr.selected[this.name] = this.value;
}); });
} }
@ -1952,7 +1964,7 @@
} }
}, },
dialog: function() { dialog: function() {
var arr, back, checked, description, dialog, favicon, hiddenNum, hiddenThreads, indicator, indicators, input, key, li, obj, overlay, ta, time, ul, _i, _j, _k, _len, _len2, _len3, _ref, _ref2, _ref3, _ref4; var arr, back, checked, description, dialog, favicon, hiddenNum, hiddenThreads, indicator, indicators, input, key, li, obj, overlay, ta, time, tr, ul, _i, _j, _len, _len2, _ref, _ref2, _ref3, _ref4;
dialog = $.el('div', { dialog = $.el('div', {
id: 'options', id: 'options',
className: 'reply dialog', className: 'reply dialog',
@ -1964,7 +1976,7 @@
<div>\ <div>\
<label for=main_tab>Main</label>\ <label for=main_tab>Main</label>\
| <label for=filter_tab>Filter</label>\ | <label for=filter_tab>Filter</label>\
| <label for=flavors_tab>Sauce</label>\ | <label for=sauces_tab>Sauce</label>\
| <label for=rice_tab>Rice</label>\ | <label for=rice_tab>Rice</label>\
| <label for=keybinds_tab>Keybinds</label>\ | <label for=keybinds_tab>Keybinds</label>\
</div>\ </div>\
@ -1973,10 +1985,16 @@
<div id=content>\ <div id=content>\
<input type=radio name=tab hidden id=main_tab checked>\ <input type=radio name=tab hidden id=main_tab checked>\
<div></div>\ <div></div>\
<input type=radio name=tab hidden id=flavors_tab>\ <input type=radio name=tab hidden id=sauces_tab>\
<div>\ <div>\
<div class=warning><code>Sauce</code> is disabled.</div>\ <div class=warning><code>Sauce</code> is disabled.</div>\
<textarea name=flavors id=flavors></textarea>\ <div>Lines starting with a <code>#</code> will be ignored.</div>\
<ul>These variables will be replaced by the corresponding url:\
<li>$1: Thumbnail.</li>\
<li>$2: Full image.</li>\
<li>$3: MD5 hash.</li>\
</ul>\
<textarea name=sauces id=sauces></textarea>\
</div>\ </div>\
<input type=radio name=tab hidden id=filter_tab>\ <input type=radio name=tab hidden id=filter_tab>\
<div>\ <div>\
@ -2024,30 +2042,9 @@
<input type=radio name=tab hidden id=keybinds_tab>\ <input type=radio name=tab hidden id=keybinds_tab>\
<div>\ <div>\
<div class=warning><code>Keybinds</code> are disabled.</div>\ <div class=warning><code>Keybinds</code> are disabled.</div>\
<div>Allowed keys: Ctrl, Alt, a-z, A-Z, 0-1, Up, Down, Right, Left.</div>\
<table><tbody>\ <table><tbody>\
<tr><th>Actions</th><th>Keybinds</th></tr>\ <tr><th>Actions</th><th>Keybinds</th></tr>\
<tr><td>Open Options</td><td><input name=openOptions></td></tr>\
<tr><td>Close Options or QR</td><td><input name=close></td></tr>\
<tr><td>Quick spoiler</td><td><input name=spoiler></td></tr>\
<tr><td>Open QR with post number inserted</td><td><input name=openQR></td></tr>\
<tr><td>Open QR without post number inserted</td><td><input name=openEmptyQR></td></tr>\
<tr><td>Submit post</td><td><input name=submit></td></tr>\
<tr><td>Select next reply</td><td><input name=nextReply ></td></tr>\
<tr><td>Select previous reply</td><td><input name=previousReply></td></tr>\
<tr><td>See next thread</td><td><input name=nextThread></td></tr>\
<tr><td>See previous thread</td><td><input name=previousThread></td></tr>\
<tr><td>Jump to the next page</td><td><input name=nextPage></td></tr>\
<tr><td>Jump to the previous page</td><td><input name=previousPage></td></tr>\
<tr><td>Jump to page 0</td><td><input name=zero></td></tr>\
<tr><td>Open thread in current tab</td><td><input name=openThread></td></tr>\
<tr><td>Open thread in new tab</td><td><input name=openThreadTab></td></tr>\
<tr><td>Expand thread</td><td><input name=expandThread></td></tr>\
<tr><td>Watch thread</td><td><input name=watch></td></tr>\
<tr><td>Hide thread</td><td><input name=hide></td></tr>\
<tr><td>Expand selected image</td><td><input name=expandImages></td></tr>\
<tr><td>Expand all images</td><td><input name=expandAllImages></td></tr>\
<tr><td>Update now</td><td><input name=update></td></tr>\
<tr><td>Reset the unread count to 0</td><td><input name=unreadCountTo0></td></tr>\
</tbody></table>\ </tbody></table>\
</div>\ </div>\
</div>' </div>'
@ -2093,17 +2090,21 @@
favicon.value = conf['favicon']; favicon.value = conf['favicon'];
$.on(favicon, 'change', $.cb.value); $.on(favicon, 'change', $.cb.value);
$.on(favicon, 'change', options.favicon); $.on(favicon, 'change', options.favicon);
_ref3 = $$('#keybinds_tab + div input', dialog); _ref3 = config.hotkeys;
for (_j = 0, _len2 = _ref3.length; _j < _len2; _j++) { for (key in _ref3) {
input = _ref3[_j]; arr = _ref3[key];
input.type = 'text'; tr = $.el('tr', {
input.value = conf[input.name]; innerHTML: "<td>" + arr[1] + "</td><td><input name=" + key + "></td>"
});
input = $('input', tr);
input.value = conf[key];
$.on(input, 'keydown', options.keybind); $.on(input, 'keydown', options.keybind);
$.add($('#keybinds_tab + div tbody', dialog), tr);
} }
indicators = {}; indicators = {};
_ref4 = $$('.warning', dialog); _ref4 = $$('.warning', dialog);
for (_k = 0, _len3 = _ref4.length; _k < _len3; _k++) { for (_j = 0, _len2 = _ref4.length; _j < _len2; _j++) {
indicator = _ref4[_k]; indicator = _ref4[_j];
key = indicator.firstChild.textContent; key = indicator.firstChild.textContent;
indicator.hidden = conf[key]; indicator.hidden = conf[key];
indicators[key] = indicator; indicators[key] = indicator;
@ -2573,26 +2574,40 @@
sauce = { sauce = {
init: function() { init: function() {
if (!(sauce.prefixes = conf['flavors'].match(/^[^#].+$/gm))) return; var link, links, _i, _len;
sauce.names = sauce.prefixes.map(function(prefix) { links = conf['sauces'].match(/^[^#].+$/gm);
return prefix.match(/(\w+)\./)[1]; this.links = [];
}); for (_i = 0, _len = links.length; _i < _len; _i++) {
return g.callbacks.push(function(root) { link = links[_i];
var i, link, prefix, span, suffix, _len, _ref, _results; this.links.push([link, link.match(/(\w+)\.\w+\//)[1]]);
if (root.className === 'inline' || !(span = $('.filesize', root))) return; }
suffix = $('a', span).href; return g.callbacks.push(this.node);
_ref = sauce.prefixes; },
_results = []; node: function(root) {
for (i = 0, _len = _ref.length; i < _len; i++) { var a, img, link, span, _i, _len, _ref;
prefix = _ref[i]; if (root.className === 'inline' || !(span = $('.filesize', root))) return;
link = $.el('a', { img = $('img', root);
textContent: sauce.names[i], _ref = sauce.links;
href: prefix + suffix, for (_i = 0, _len = _ref.length; _i < _len; _i++) {
target: '_blank' link = _ref[_i];
}); a = $.el('a', {
_results.push($.add(span, $.tn(' '), link)); textContent: link[1],
href: sauce.href(link[0], img),
target: '_blank'
});
$.add(span, $.tn(' '), a);
}
},
href: function(link, img) {
return link.replace(/\$\d/, function(fragment) {
switch (fragment) {
case '$1':
return img.src;
case '$2':
return img.parentNode.href;
case '$3':
return img.getAttribute('md5').replace(/\=+$/, '');
} }
return _results;
}); });
} }
}; };
@ -2739,8 +2754,8 @@
quoteBacklink = { quoteBacklink = {
init: function() { init: function() {
var format; var format;
format = conf['backlink'].replace(/%id/, "' + id + '"); format = conf['backlink'].replace(/%id/g, "' + id + '");
quoteBacklink.funk = Function('id', "return'" + format + "'"); quoteBacklink.funk = Function('id', "return '" + format + "'");
return g.callbacks.push(function(root) { return g.callbacks.push(function(root) {
var a, container, el, id, link, qid, quote, quotes, _i, _len, _ref, _results; var a, container, el, id, link, qid, quote, quotes, _i, _len, _ref, _results;
if (/\binline\b/.test(root.className)) return; if (/\binline\b/.test(root.className)) return;
@ -2748,7 +2763,7 @@
_ref = $$('.quotelink', root); _ref = $$('.quotelink', root);
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
quote = _ref[_i]; quote = _ref[_i];
if (qid = quote.hash.slice(1)) quotes[qid] = quote; if (qid = quote.hash.slice(1)) quotes[qid] = true;
} }
id = $('input', root).name; id = $('input', root).name;
a = $.el('a', { a = $.el('a', {
@ -2758,8 +2773,9 @@
}); });
_results = []; _results = [];
for (qid in quotes) { for (qid in quotes) {
if (!(el = $.id(qid))) continue; if (!(el = $.id(qid)) || el.className === 'op' && !conf['OP Backlinks']) {
if (el.className === 'op' && !conf['OP Backlinks']) continue; continue;
}
link = a.cloneNode(true); link = a.cloneNode(true);
if (conf['Quote Preview']) { if (conf['Quote Preview']) {
$.on(link, 'mouseover', quotePreview.mouseover); $.on(link, 'mouseover', quotePreview.mouseover);
@ -3161,15 +3177,11 @@
empty: 'data:image/gif;base64,R0lGODlhEAAQAJEAAAAAAP///9vb2////yH5BAEAAAMALAAAAAAQABAAAAIvnI+pq+D9DBAUoFkPFnbs7lFZKIJOJJ3MyraoB14jFpOcVMpzrnF3OKlZYsMWowAAOw==', empty: 'data:image/gif;base64,R0lGODlhEAAQAJEAAAAAAP///9vb2////yH5BAEAAAMALAAAAAAQABAAAAIvnI+pq+D9DBAUoFkPFnbs7lFZKIJOJJ3MyraoB14jFpOcVMpzrnF3OKlZYsMWowAAOw==',
dead: 'data:image/gif;base64,R0lGODlhEAAQAKECAAAAAP8AAP///////yH5BAEKAAIALAAAAAAQABAAAAIvlI+pq+D9DAgUoFkPDlbs7lFZKIJOJJ3MyraoB14jFpOcVMpzrnF3OKlZYsMWowAAOw==', dead: 'data:image/gif;base64,R0lGODlhEAAQAKECAAAAAP8AAP///////yH5BAEKAAIALAAAAAAQABAAAAIvlI+pq+D9DAgUoFkPDlbs7lFZKIJOJJ3MyraoB14jFpOcVMpzrnF3OKlZYsMWowAAOw==',
update: function() { update: function() {
var clone, favicon, l; var favicon, l;
l = unread.replies.length; l = unread.replies.length;
favicon = $('link[rel="shortcut icon"]', d.head); favicon = $('link[rel="shortcut icon"]', d.head);
favicon.href = g.dead ? l ? this.unreadDead : this.dead : l ? this.unread : this["default"]; favicon.href = g.dead ? l ? this.unreadDead : this.dead : l ? this.unread : this["default"];
if (engine !== 'webkit') { if (engine !== 'webkit') return $.add(d.head, $.rm(favicon));
clone = favicon.cloneNode(true);
favicon.href = null;
return $.replace(favicon, clone);
}
} }
}; };
@ -3291,7 +3303,7 @@
var thumb, _i, _j, _len, _len2, _ref, _ref2, _results, _results2; var thumb, _i, _j, _len, _len2, _ref, _ref2, _results, _results2;
imgExpand.on = this.checked; imgExpand.on = this.checked;
if (imgExpand.on) { if (imgExpand.on) {
_ref = $$('.op > a > img[md5]:last-child, table:not([hidden]) img[md5]:last-child'); _ref = $$('img[md5]');
_results = []; _results = [];
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
thumb = _ref[_i]; thumb = _ref[_i];
@ -3347,22 +3359,21 @@
}, },
contract: function(thumb) { contract: function(thumb) {
thumb.hidden = false; thumb.hidden = false;
return $.rm(thumb.nextSibling); return thumb.nextSibling.hidden = true;
}, },
expand: function(thumb, url) { expand: function(thumb, url) {
var a, filesize, img, max; var a, img;
if (thumb.hidden) return; if ($.x('ancestor-or-self::*[@hidden]', thumb)) return;
thumb.hidden = true;
if (img = thumb.nextSibling) {
img.hidden = false;
return;
}
a = thumb.parentNode; a = thumb.parentNode;
img = $.el('img', { img = $.el('img', {
src: url || a.href src: url || a.href
}); });
if (engine === 'gecko' && a.parentNode.className !== 'op') {
filesize = $.x('preceding-sibling::span[@class="filesize"]', a).textContent;
max = filesize.match(/(\d+)x/);
img.style.maxWidth = "" + max[1] + "px";
}
if (conf['404 Redirect']) $.on(img, 'error', imgExpand.error); if (conf['404 Redirect']) $.on(img, 'error', imgExpand.error);
thumb.hidden = true;
return $.add(a, img); return $.add(a, img);
}, },
error: function() { error: function() {
@ -3371,6 +3382,7 @@
thumb = this.previousSibling; thumb = this.previousSibling;
src = href.split('/'); src = href.split('/');
imgExpand.contract(thumb); imgExpand.contract(thumb);
$.rm(this);
if (!(this.src.split('/')[2] === 'images.4chan.org' && (url = redirect.image(src[3], src[5])))) { if (!(this.src.split('/')[2] === 'images.4chan.org' && (url = redirect.image(src[3], src[5])))) {
if (g.dead) return; if (g.dead) return;
url = href + '?' + Date.now(); url = href + '?' + Date.now();
@ -3833,8 +3845,8 @@ img[md5], img[md5] + img {\
resize: vertical;\ resize: vertical;\
width: 100%;\ width: 100%;\
}\ }\
#flavors {\ #sauces {\
height: 100%;\ height: 320px;\
}\ }\
\ \
#updater {\ #updater {\
@ -3853,22 +3865,24 @@ img[md5], img[md5] + img {\
}\ }\
\ \
#watcher {\ #watcher {\
padding-bottom: 5px;\
position: absolute;\ position: absolute;\
}\
#watcher > div {\
overflow: hidden;\ overflow: hidden;\
padding-right: 5px;\
padding-left: 5px;\
text-overflow: ellipsis;\
max-width: 200px;\
white-space: nowrap;\ white-space: nowrap;\
}\ }\
#watcher > div.move {\ #watcher:not(:hover) {\
text-decoration: underline;\ max-height: 220px;\
padding-top: 5px;\
}\ }\
#watcher > div:last-child {\ #watcher > div {\
padding-bottom: 5px;\ max-width: 200px;\
overflow: hidden;\
padding-left: 5px;\
padding-right: 5px;\
text-overflow: ellipsis;\
}\
#watcher > .move {\
padding-top: 5px;\
text-decoration: underline;\
}\ }\
\ \
#qp {\ #qp {\

2
Cakefile
View File

@ -2,7 +2,7 @@
{exec} = require 'child_process' {exec} = require 'child_process'
fs = require 'fs' fs = require 'fs'
VERSION = '2.25.3' VERSION = '2.25.5'
HEADER = """ HEADER = """
// ==UserScript== // ==UserScript==

12
changelog
View File

@ -1,6 +1,18 @@
master master
- aeosynth - aeosynth
prevent post form flicker prevent post form flicker
- Mayhem
Increase Sauce linking possibilites:
Thumbnails, full images, MD5 hashes.
2.25.5
- Mayhem
Hide the normal post form by default, optional.
2.25.4
- Mayhem
Fix text inputs not sent/saved correctly in the QR when pasted for example.
Revert hidding normal post form.
2.25.3 2.25.3
- Mayhem - Mayhem

2
latest.js
View File

@ -1 +1 @@
postMessage({version:'2.25.3'},'*'); postMessage({version:'2.25.5'},'*');

296
script.coffee
View File

@ -38,6 +38,7 @@ config =
'Auto Hide QR': [true, 'Automatically hide the quick reply when posting.'] 'Auto Hide QR': [true, 'Automatically hide the quick reply when posting.']
'Remember Subject': [false, 'Remember the subject field, instead of resetting after posting.'] 'Remember Subject': [false, 'Remember the subject field, instead of resetting after posting.']
'Remember Spoiler': [false, 'Remember the spoiler state, instead of resetting after posting.'] 'Remember Spoiler': [false, 'Remember the spoiler state, instead of resetting after posting.']
'Hide Original Post Form': [true, 'Replace the normal post form with a shortcut to open the QR.']
Quoting: Quoting:
'Quote Backlinks': [true, 'Add quote backlinks'] 'Quote Backlinks': [true, 'Add quote backlinks']
'OP Backlinks': [false, 'Add backlinks to the OP'] 'OP Backlinks': [false, 'Add backlinks to the OP']
@ -56,48 +57,52 @@ config =
filename: '' filename: ''
filesize: '' filesize: ''
md5: '' md5: ''
flavors: [ sauces: [
'http://iqdb.org/?url=' 'http://iqdb.org/?url=$1'
'http://google.com/searchbyimage?image_url=' 'http://www.google.com/searchbyimage?image_url=$1'
'#http://tineye.com/search?url=' '#http://tineye.com/search?url=$1'
'#http://saucenao.com/search.php?db=999&url=' '#http://saucenao.com/search.php?db=999&url=$1'
'#http://3d.iqdb.org/?url=' '#http://3d.iqdb.org/?url=$1'
'#http://regex.info/exif.cgi?imgurl=' '#http://regex.info/exif.cgi?imgurl=$2'
'#http://imgur.com/upload?url=' '# uploaders:'
'#http://ompldr.org/upload?url1=' '#http://imgur.com/upload?url=$2'
'#http://ompldr.org/upload?url1=$2'
'# "View Same" in archives:'
'#http://archive.foolz.us/a/image/$3/'
'#http://archive.installgentoo.net/g/image/$3'
].join '\n' ].join '\n'
time: '%m/%d/%y(%a)%H:%M' time: '%m/%d/%y(%a)%H:%M'
backlink: '>>%id' backlink: '>>%id'
favicon: 'ferongr' favicon: 'ferongr'
hotkeys: hotkeys:
openOptions: 'ctrl+o' openOptions: ['ctrl+o', 'Open Options']
close: 'Esc' close: ['Esc', 'Close Options or QR']
spoiler: 'ctrl+s' spoiler: ['ctrl+s', 'Quick spoiler']
openQR: 'i' openQR: ['i', 'Open QR with post number inserted']
openEmptyQR: 'I' openEmptyQR: ['I', 'Open QR without post number inserted']
submit: 'alt+s' submit: ['alt+s', 'Submit post']
nextReply: 'J' nextReply: ['J', 'Select next reply']
previousReply: 'K' previousReply: ['K', 'Select previous reply']
nextThread: 'n' nextThread: ['n', 'See next thread']
previousThread: 'p' previousThread: ['p', 'See previous thread']
nextPage: 'L' nextPage: ['L', 'Jump to the next page']
previousPage: 'H' previousPage: ['H', 'Jump to the previous page']
zero: '0' zero: ['0', 'Jump to page 0']
openThreadTab: 'o' openThreadTab: ['o', 'Open thread in current tab']
openThread: 'O' openThread: ['O', 'Open thread in new tab']
expandThread: 'e' expandThread: ['e', 'Expand thread']
watch: 'w' watch: ['w', 'Watch thread']
hide: 'x' hide: ['x', 'Hide thread']
expandImages: 'm' expandImages: ['m', 'Expand selected image']
expandAllImages: 'M' expandAllImages: ['M', 'Expand all images']
update: 'u' update: ['u', 'Update now']
unreadCountTo0: 'z' unreadCountTo0: ['z', 'Reset unread count to 0']
updater: updater:
checkbox: checkbox:
'Scrolling': [false, 'Scroll updated posts into view. Only enabled at bottom of page.'] 'Scrolling': [false, 'Scroll updated posts into view. Only enabled at bottom of page.']
'Scroll BG': [false, 'Scroll background tabs'] 'Scroll BG': [false, 'Scroll background tabs']
'Verbose': [true, 'Show countdown timer, new post count'] 'Verbose': [true, 'Show countdown timer, new post count']
'Auto Update': [true, 'Automatically fetch new posts'] 'Auto Update': [true, 'Automatically fetch new posts']
'Interval': 30 'Interval': 30
# XXX Chrome can't into {log} = console # XXX Chrome can't into {log} = console
@ -107,20 +112,19 @@ log = console.log.bind? console
# flatten the config # flatten the config
conf = {} conf = {}
(flatten = (parent, obj) -> (flatten = (parent, obj) ->
if obj.length #array if typeof obj is 'object'
if typeof obj[0] is 'boolean' # array
if obj.length
conf[parent] = obj[0] conf[parent] = obj[0]
else # object
conf[parent] = obj else for key, val of obj
else if typeof obj is 'object'
for key, val of obj
flatten key, val flatten key, val
else #constant else # string or number
conf[parent] = obj conf[parent] = obj
) null, config ) null, config
NAMESPACE = '4chan_x.' NAMESPACE = '4chan_x.'
VERSION = '2.25.3' VERSION = '2.25.5'
SECOND = 1000 SECOND = 1000
MINUTE = 60*SECOND MINUTE = 60*SECOND
HOUR = 60*MINUTE HOUR = 60*MINUTE
@ -217,7 +221,7 @@ $ = (selector, root=d.body) ->
$.extend = (object, properties) -> $.extend = (object, properties) ->
for key, val of properties for key, val of properties
object[key] = val object[key] = val
object return
$.extend $, $.extend $,
ready: (fc) -> ready: (fc) ->
@ -282,6 +286,7 @@ $.extend $,
add: (parent, children...) -> add: (parent, children...) ->
for child in children for child in children
parent.appendChild child parent.appendChild child
return
prepend: (parent, child) -> prepend: (parent, child) ->
parent.insertBefore child, parent.firstChild parent.insertBefore child, parent.firstChild
after: (root, el) -> after: (root, el) ->
@ -862,23 +867,28 @@ nav =
qr = qr =
init: -> init: ->
return unless $.id 'recaptcha_challenge_field_holder' return unless $.id 'recaptcha_challenge_field_holder'
h1 = $.el 'h1' if conf['Hide Original Post Form']
innerHTML: '<a href=javascript:;>Open the Quick Reply</a>' link = $.el 'h1', innerHTML: "<a href=javascript:;>#{if g.REPLY then 'Open the Quick Reply' else 'Create a New Thread'}</a>"
$.on $('a', h1), 'click', qr.open $.on $('a', link), 'click', qr.open
$.add $('.postarea'), h1 form = d.forms[0]
form.hidden = true
$.before form, link
g.callbacks.push (root) -> g.callbacks.push (root) ->
$.on $('.quotejs + .quotejs', root), 'click', qr.quote $.on $('.quotejs + .quotejs', root), 'click', qr.quote
iframe = $.el 'iframe', iframe = $.el 'iframe',
id: 'iframe' id: 'iframe'
hidden: true hidden: true
src: 'http://sys.4chan.org/post' src: 'http://sys.4chan.org/post'
$.on iframe, 'error', -> @src = @src $.on iframe, 'error', -> @src = @src
# Greasemonkey ghetto fix # Greasemonkey ghetto fix
$.on iframe, 'load', -> loadChecking = (iframe) ->
unless qr.status.ready or @src is 'about:blank' unless qr.status.ready
@src = 'about:blank' iframe.src = 'about:blank'
setTimeout (=> @src = 'http://sys.4chan.org/post'), 250 setTimeout (-> iframe.src = 'http://sys.4chan.org/post'), 250
$.on iframe, 'load', -> unless @src is 'about:blank' then setTimeout loadChecking, 250, @
$.add d.body, iframe $.add d.body, iframe
if conf['Persistent QR'] if conf['Persistent QR']
qr.dialog() qr.dialog()
qr.hide() if conf['Auto Hide QR'] qr.hide() if conf['Auto Hide QR']
@ -984,15 +994,15 @@ qr =
ta = $ 'textarea', qr.el ta = $ 'textarea', qr.el
caretPos = ta.selectionStart caretPos = ta.selectionStart
# Replace selection for text. # Replace selection for text.
ta.value = ta.value[0...caretPos] + text + ta.value[ta.selectionEnd...ta.value.length] # onchange event isn't triggered, save value.
qr.selected.el.lastChild.textContent =
qr.selected.com =
ta.value =
ta.value[0...caretPos] + text + ta.value[ta.selectionEnd...ta.value.length]
ta.focus() ta.focus()
# Move the caret to the end of the new quote. # Move the caret to the end of the new quote.
ta.selectionEnd = ta.selectionStart = caretPos + text.length ta.selectionEnd = ta.selectionStart = caretPos + text.length
# onchange event isn't triggered, save value.
qr.selected.com = ta.value
qr.selected.el.lastChild.textContent = ta.value
fileDrop: (e) -> fileDrop: (e) ->
return if /TEXTAREA|INPUT/.test e.target.nodeName return if /TEXTAREA|INPUT/.test e.target.nodeName
e.preventDefault() e.preventDefault()
@ -1129,9 +1139,14 @@ qr =
@img.src = "http://www.google.com/recaptcha/api/image?c=#{challenge}" @img.src = "http://www.google.com/recaptcha/api/image?c=#{challenge}"
@input.value = null @input.value = null
count: (count) -> count: (count) ->
s = if count is 1 then '' else 's' @input.placeholder = switch count
@input.placeholder = "Verification (#{count} cached captcha#{s})" when 0
@input.alt = count # For XTRM RICE. 'Verification (Shift + Enter to cache)'
when 1
'Vertification (1 cached captcha)'
else
"Verification (#{count} cached captchas)"
@input.alt = count # For XTRM RICE.
reload: (focus) -> reload: (focus) ->
window.location = 'javascript:Recaptcha.reload()' window.location = 'javascript:Recaptcha.reload()'
# Focus if we meant to. # Focus if we meant to.
@ -1150,11 +1165,11 @@ qr =
qr.el = ui.dialog 'qr', 'top:0;right:0;', ' qr.el = ui.dialog 'qr', 'top:0;right:0;', '
<div class=move> <div class=move>
Quick Reply <input type=checkbox id=autohide title=Auto-hide> Quick Reply <input type=checkbox id=autohide title=Auto-hide>
<span> <a class=close>x</a></span> <span> <a class=close title=Close>x</a></span>
</div> </div>
<form> <form>
<div><input id=dump class=field type=button title="Dump list" value=+><input name=name title=Name placeholder=Name class=field size=1><input name=email title=E-mail placeholder=E-mail class=field size=1><input name=sub title=Subject placeholder=Subject class=field size=1></div> <div><input id=dump class=field type=button title="Dump list" value=+><input name=name title=Name placeholder=Name class=field size=1><input name=email title=E-mail placeholder=E-mail class=field size=1><input name=sub title=Subject placeholder=Subject class=field size=1></div>
<div id=replies><div><a id=addReply href=javascript:;>+</a></div></div> <div id=replies><div><a id=addReply href=javascript:; title="Add a reply">+</a></div></div>
<div><textarea name=com title=Comment placeholder=Comment class=field></textarea></div> <div><textarea name=com title=Comment placeholder=Comment class=field></textarea></div>
<div class=captcha title=Reload><img></div> <div class=captcha title=Reload><img></div>
<div><input title=Verification class=field autocomplete=off size=1></div> <div><input title=Verification class=field autocomplete=off size=1></div>
@ -1186,7 +1201,9 @@ qr =
threads = '<option value=new>New thread</option>' threads = '<option value=new>New thread</option>'
for thread in $$ '.op' for thread in $$ '.op'
threads += "<option value=#{thread.id}>Thread #{thread.id}</option>" threads += "<option value=#{thread.id}>Thread #{thread.id}</option>"
$.prepend $('.move > span', qr.el), $.el 'select', innerHTML: threads $.prepend $('.move > span', qr.el), $.el 'select'
innerHTML: threads
title: 'Create a new thread / Reply to a thread'
$.on $('select', qr.el), 'mousedown', (e) -> e.stopPropagation() $.on $('select', qr.el), 'mousedown', (e) -> e.stopPropagation()
$.on $('#autohide', qr.el), 'change', qr.toggleHide $.on $('#autohide', qr.el), 'change', qr.toggleHide
$.on $('.close', qr.el), 'click', qr.close $.on $('.close', qr.el), 'click', qr.close
@ -1200,8 +1217,10 @@ qr =
new qr.reply().select() new qr.reply().select()
# save selected reply's data # save selected reply's data
for input in ['name', 'email', 'sub', 'com'] for name in ['name', 'email', 'sub', 'com']
$.on $("[name=#{input}]", qr.el), 'keyup', -> qr.selected[@name] = @value input = $ "[name=#{name}]", qr.el
$.on input, 'keyup', -> qr.selected[@name] = @value
$.on input, 'change', -> qr.selected[@name] = @value
# sync between tabs # sync between tabs
$.sync 'qr.persona', (persona) -> $.sync 'qr.persona', (persona) ->
return if qr.replies.length isnt 1 return if qr.replies.length isnt 1
@ -1502,7 +1521,7 @@ options =
<div> <div>
<label for=main_tab>Main</label> <label for=main_tab>Main</label>
| <label for=filter_tab>Filter</label> | <label for=filter_tab>Filter</label>
| <label for=flavors_tab>Sauce</label> | <label for=sauces_tab>Sauce</label>
| <label for=rice_tab>Rice</label> | <label for=rice_tab>Rice</label>
| <label for=keybinds_tab>Keybinds</label> | <label for=keybinds_tab>Keybinds</label>
</div> </div>
@ -1511,10 +1530,16 @@ options =
<div id=content> <div id=content>
<input type=radio name=tab hidden id=main_tab checked> <input type=radio name=tab hidden id=main_tab checked>
<div></div> <div></div>
<input type=radio name=tab hidden id=flavors_tab> <input type=radio name=tab hidden id=sauces_tab>
<div> <div>
<div class=warning><code>Sauce</code> is disabled.</div> <div class=warning><code>Sauce</code> is disabled.</div>
<textarea name=flavors id=flavors></textarea> <div>Lines starting with a <code>#</code> will be ignored.</div>
<ul>These variables will be replaced by the corresponding url:
<li>$1: Thumbnail.</li>
<li>$2: Full image.</li>
<li>$3: MD5 hash.</li>
</ul>
<textarea name=sauces id=sauces></textarea>
</div> </div>
<input type=radio name=tab hidden id=filter_tab> <input type=radio name=tab hidden id=filter_tab>
<div> <div>
@ -1562,30 +1587,9 @@ options =
<input type=radio name=tab hidden id=keybinds_tab> <input type=radio name=tab hidden id=keybinds_tab>
<div> <div>
<div class=warning><code>Keybinds</code> are disabled.</div> <div class=warning><code>Keybinds</code> are disabled.</div>
<div>Allowed keys: Ctrl, Alt, a-z, A-Z, 0-1, Up, Down, Right, Left.</div>
<table><tbody> <table><tbody>
<tr><th>Actions</th><th>Keybinds</th></tr> <tr><th>Actions</th><th>Keybinds</th></tr>
<tr><td>Open Options</td><td><input name=openOptions></td></tr>
<tr><td>Close Options or QR</td><td><input name=close></td></tr>
<tr><td>Quick spoiler</td><td><input name=spoiler></td></tr>
<tr><td>Open QR with post number inserted</td><td><input name=openQR></td></tr>
<tr><td>Open QR without post number inserted</td><td><input name=openEmptyQR></td></tr>
<tr><td>Submit post</td><td><input name=submit></td></tr>
<tr><td>Select next reply</td><td><input name=nextReply ></td></tr>
<tr><td>Select previous reply</td><td><input name=previousReply></td></tr>
<tr><td>See next thread</td><td><input name=nextThread></td></tr>
<tr><td>See previous thread</td><td><input name=previousThread></td></tr>
<tr><td>Jump to the next page</td><td><input name=nextPage></td></tr>
<tr><td>Jump to the previous page</td><td><input name=previousPage></td></tr>
<tr><td>Jump to page 0</td><td><input name=zero></td></tr>
<tr><td>Open thread in current tab</td><td><input name=openThread></td></tr>
<tr><td>Open thread in new tab</td><td><input name=openThreadTab></td></tr>
<tr><td>Expand thread</td><td><input name=expandThread></td></tr>
<tr><td>Watch thread</td><td><input name=watch></td></tr>
<tr><td>Hide thread</td><td><input name=hide></td></tr>
<tr><td>Expand selected image</td><td><input name=expandImages></td></tr>
<tr><td>Expand all images</td><td><input name=expandAllImages></td></tr>
<tr><td>Update now</td><td><input name=update></td></tr>
<tr><td>Reset the unread count to 0</td><td><input name=unreadCountTo0></td></tr>
</tbody></table> </tbody></table>
</div> </div>
</div>' </div>'
@ -1628,10 +1632,13 @@ options =
$.on favicon, 'change', options.favicon $.on favicon, 'change', options.favicon
#keybinds #keybinds
for input in $$ '#keybinds_tab + div input', dialog for key, arr of config.hotkeys
input.type = 'text' tr = $.el 'tr',
input.value = conf[input.name] innerHTML: "<td>#{arr[1]}</td><td><input name=#{key}></td>"
input = $ 'input', tr
input.value = conf[key]
$.on input, 'keydown', options.keybind $.on input, 'keydown', options.keybind
$.add $('#keybinds_tab + div tbody', dialog), tr
#indicate if the settings require a feature to be enabled #indicate if the settings require a feature to be enabled
indicators = {} indicators = {}
@ -2029,17 +2036,31 @@ anonymize =
sauce = sauce =
init: -> init: ->
return unless sauce.prefixes = conf['flavors'].match /^[^#].+$/gm # return unless
sauce.names = sauce.prefixes.map (prefix) -> prefix.match(/(\w+)\./)[1] links = conf['sauces'].match /^[^#].+$/gm
g.callbacks.push (root) -> @links = []
return if root.className is 'inline' or not span = $ '.filesize', root for link in links
suffix = $('a', span).href @links.push [link, link.match(/(\w+)\.\w+\//)[1]]
for prefix, i in sauce.prefixes g.callbacks.push @node
link = $.el 'a', node: (root) ->
textContent: sauce.names[i] return if root.className is 'inline' or not span = $ '.filesize', root
href: prefix + suffix img = $ 'img', root
target: '_blank' for link in sauce.links
$.add span, $.tn(' '), link a = $.el 'a',
textContent: link[1]
href: sauce.href link[0], img
target: '_blank'
$.add span, $.tn(' '), a
return
href: (link, img) ->
link.replace /\$\d/, (fragment) ->
switch fragment
when '$1'
img.src
when '$2'
img.parentNode.href
when '$3'
img.getAttribute('md5').replace /\=+$/, ''
revealSpoilers = revealSpoilers =
init: -> init: ->
@ -2142,26 +2163,25 @@ titlePost =
quoteBacklink = quoteBacklink =
init: -> init: ->
format = conf['backlink'].replace /%id/, "' + id + '" format = conf['backlink'].replace /%id/g, "' + id + '"
quoteBacklink.funk = Function 'id', "return'#{format}'" quoteBacklink.funk = Function 'id', "return '#{format}'"
g.callbacks.push (root) -> g.callbacks.push (root) ->
return if /\binline\b/.test root.className return if /\binline\b/.test root.className
quotes = {} quotes = {}
for quote in $$ '.quotelink', root for quote in $$ '.quotelink', root
#don't process >>>/b/ # Don't process >>>/b/.
if qid = quote.hash[1..] if qid = quote.hash[1..]
#duplicate quotes get overwritten # Duplicate quotes get overwritten.
quotes[qid] = quote quotes[qid] = true
# op or reply # OP or reply id.
id = $('input', root).name id = $('input', root).name
a = $.el 'a', a = $.el 'a',
href: "##{id}" href: "##{id}"
className: if root.hidden then 'filtered backlink' else 'backlink' className: if root.hidden then 'filtered backlink' else 'backlink'
textContent: quoteBacklink.funk id textContent: quoteBacklink.funk id
for qid of quotes for qid of quotes
continue unless el = $.id qid # Don't backlink the OP.
#don't backlink the op continue if !(el = $.id qid) or el.className is 'op' and !conf['OP Backlinks']
continue if el.className is 'op' and !conf['OP Backlinks']
link = a.cloneNode true link = a.cloneNode true
if conf['Quote Preview'] if conf['Quote Preview']
$.on link, 'mouseover', quotePreview.mouseover $.on link, 'mouseover', quotePreview.mouseover
@ -2457,9 +2477,7 @@ Favicon =
#`favicon.href = href` isn't enough on Opera #`favicon.href = href` isn't enough on Opera
#Opera won't always update the favicon if the href do not change #Opera won't always update the favicon if the href do not change
if engine isnt 'webkit' if engine isnt 'webkit'
clone = favicon.cloneNode true $.add d.head, $.rm favicon
favicon.href = null
$.replace favicon, clone
redirect = redirect =
init: -> init: ->
@ -2526,7 +2544,7 @@ imgExpand =
all: -> all: ->
imgExpand.on = @checked imgExpand.on = @checked
if imgExpand.on #expand if imgExpand.on #expand
for thumb in $$ '.op > a > img[md5]:last-child, table:not([hidden]) img[md5]:last-child' for thumb in $$ 'img[md5]'
imgExpand.expand thumb imgExpand.expand thumb
else #contract else #contract
for thumb in $$ 'img[md5][hidden]' for thumb in $$ 'img[md5][hidden]'
@ -2562,19 +2580,20 @@ imgExpand =
contract: (thumb) -> contract: (thumb) ->
thumb.hidden = false thumb.hidden = false
$.rm thumb.nextSibling thumb.nextSibling.hidden = true
expand: (thumb, url) -> expand: (thumb, url) ->
return if thumb.hidden # Do not expand images of hidden/filtered replies, or already expanded pictures.
return if $.x 'ancestor-or-self::*[@hidden]', thumb
thumb.hidden = true
if img = thumb.nextSibling
# Expand already loaded picture
img.hidden = false
return
a = thumb.parentNode a = thumb.parentNode
img = $.el 'img', img = $.el 'img',
src: url or a.href src: url or a.href
if engine is 'gecko' and a.parentNode.className isnt 'op'
filesize = $.x('preceding-sibling::span[@class="filesize"]', a).textContent
max = filesize.match /(\d+)x/
img.style.maxWidth = "#{max[1]}px"
$.on img, 'error', imgExpand.error if conf['404 Redirect'] $.on img, 'error', imgExpand.error if conf['404 Redirect']
thumb.hidden = true
$.add a, img $.add a, img
error: -> error: ->
@ -2582,6 +2601,7 @@ imgExpand =
thumb = @previousSibling thumb = @previousSibling
src = href.split '/' src = href.split '/'
imgExpand.contract thumb imgExpand.contract thumb
$.rm @
unless @src.split('/')[2] is 'images.4chan.org' and url = redirect.image src[3], src[5] unless @src.split('/')[2] is 'images.4chan.org' and url = redirect.image src[3], src[5]
return if g.dead return if g.dead
# CloudFlare may cache banned pages instead of images. # CloudFlare may cache banned pages instead of images.
@ -3075,8 +3095,8 @@ img[md5], img[md5] + img {
resize: vertical; resize: vertical;
width: 100%; width: 100%;
} }
#flavors { #sauces {
height: 100%; height: 320px;
} }
#updater { #updater {
@ -3095,22 +3115,24 @@ img[md5], img[md5] + img {
} }
#watcher { #watcher {
padding-bottom: 5px;
position: absolute; position: absolute;
}
#watcher > div {
overflow: hidden; overflow: hidden;
padding-right: 5px;
padding-left: 5px;
text-overflow: ellipsis;
max-width: 200px;
white-space: nowrap; white-space: nowrap;
} }
#watcher > div.move { #watcher:not(:hover) {
text-decoration: underline; max-height: 220px;
padding-top: 5px;
} }
#watcher > div:last-child { #watcher > div {
padding-bottom: 5px; max-width: 200px;
overflow: hidden;
padding-left: 5px;
padding-right: 5px;
text-overflow: ellipsis;
}
#watcher > .move {
padding-top: 5px;
text-decoration: underline;
} }
#qp { #qp {