diff --git a/4chan_x.js b/4chan_x.js
index ac8680af2..5694cc216 100644
--- a/4chan_x.js
+++ b/4chan_x.js
@@ -7,6 +7,7 @@
// @license MIT; http://en.wikipedia.org/wiki/Mit_license
// @include http://boards.4chan.org/*
// @include http://sys.4chan.org/*
+// @include file://*
// @updateURL http://userscripts.org/scripts/source/51412.meta.js
// ==/UserScript==
@@ -71,6 +72,7 @@
'404 Redirect': [true, 'Redirect dead threads'],
'Anonymize': [false, 'Make everybody anonymous'],
'Auto Watch': [true, 'Automatically watch threads that you start'],
+ 'Auto Watch Reply': [false, 'Automatically watch threads that you reply to'],
'Comment Expansion': [true, 'Expand too long comments'],
'Cooldown': [false, 'Prevent \'flood detected\' errors (buggy)'],
'Image Auto-Gif': [false, 'Animate gif thumbnails'],
@@ -92,8 +94,7 @@
'Thread Navigation': [true, 'Navigate to previous / next thread'],
'Thread Updater': [true, 'Update threads'],
'Thread Watcher': [true, 'Bookmark threads'],
- 'Unread Count': [true, 'Show unread post count in tab title'],
- 'Watch on Reply': [false, 'Automatically watch threads you reply to']
+ 'Unread Count': [true, 'Show unread post count in tab title']
},
textarea: {
flavors: ['http://regex.info/exif.cgi?url=', 'http://iqdb.org/?url=', 'http://tineye.com/search?url=', '#http://saucenao.com/search.php?db=999&url='].join('\n')
@@ -171,7 +172,7 @@
} else {
el.style.bottom = '0px';
}
- el.querySelector('div.move').addEventListener('mousedown', ui.dragstart, true);
+ el.querySelector('div.move').addEventListener('mousedown', ui.dragstart, false);
if ((_ref3 = el.querySelector('div.move a[name=close]')) != null) {
_ref3.addEventListener('click', (function() {
return el.parentNode.removeChild(el);
@@ -988,15 +989,11 @@
}
},
message: function(e) {
- var data, dialog, error;
+ var data, dialog;
data = e.data;
dialog = $('#qr');
if (data) {
- error = $.el('span', {
- className: 'error',
- textContent: data
- });
- $.append(dialog, error);
+ $('#error').textContent = data;
qr.autohide.unset();
} else {
if (dialog) {
@@ -1024,59 +1021,36 @@
return _results;
},
submit: function(e) {
- var form, isQR, recaptcha, span, thread, threads, value, _i, _len;
+ var form, id, isQR, op;
form = e.target;
isQR = form.parentNode.id === 'qr';
- if ($.config('Watch on Reply') && $.config('Thread Watcher')) {
+ if ($.config('Auto Watch Reply') && $.config('Thread Watcher')) {
if (g.REPLY && $('img.favicon').src === Favicon.empty) {
watcher.watch(null, g.THREAD_ID);
} else {
- value = $('input[name=resto]').value;
- threads = $$('div.op');
- for (_i = 0, _len = threads.length; _i < _len; _i++) {
- thread = threads[_i];
- if (thread.id === value && $('img.favicon', thread).src === Favicon.empty) {
- watcher.watch(thread, value);
- }
+ id = $('input[name=resto]').value;
+ op = d.getElementById(id);
+ if ($('img.favicon', op).src === Favicon.empty) {
+ watcher.watch(op, id);
}
}
}
if (isQR) {
- if (span = this.nextSibling) {
- $.remove(span);
- }
+ $('#error').textContent = '';
}
if ($.config('Cooldown')) {
if (qr.cooldown()) {
e.preventDefault();
alert('Stop posting so often!');
if (isQR) {
- span = $.el('span', {
- className: 'error',
- textContent: 'Stop posting so often!'
- });
- $.append(this.parentNode, span);
+ $('#error').textContent = 'Stop posting so often!';
}
return;
}
}
- recaptcha = $('input[name=recaptcha_response_field]', this);
- if (recaptcha.value) {
- qr.sage = $('input[name=email]', form).value === 'sage';
- if (isQR) {
- return qr.autohide.set();
- }
- } else {
- e.preventDefault();
- alert('You forgot to type in the verification.');
- recaptcha.focus();
- if (isQR) {
- span = $.el('span', {
- className: 'error',
- textContent: 'You forgot to type in the verification.'
- });
- return $.append(this.parentNode, span);
- }
+ qr.sage = $('input[name=email]', form).value === 'sage';
+ if (isQR) {
+ return qr.autohide.set();
}
},
quote: function(e) {
@@ -1156,35 +1130,35 @@
}
},
dialog: function(link) {
- var clone, dialog, el, html, resto, script, xpath, _i, _len, _ref;
- html = "";
+ var MAX_FILE_SIZE, THREAD_ID, clone, dialog, el, html, spoiler;
+ MAX_FILE_SIZE = $('input[name="MAX_FILE_SIZE"]').value;
+ THREAD_ID = g.THREAD_ID || link.pathname.split('/').pop();
+ html = "
";
dialog = ui.dialog('qr', {
top: '0px',
left: '0px'
}, html);
- el = $('input[title=autohide]', dialog);
+ $.bind($('input[name=name]', dialog), 'mousedown', function(e) {
+ return e.stopPropagation();
+ });
+ el = $('#autohide', dialog);
$.bind(el, 'click', qr.cb.autohide);
- clone = $('form[name=post]').cloneNode(true);
- _ref = $$('script', clone);
- for (_i = 0, _len = _ref.length; _i < _len; _i++) {
- script = _ref[_i];
- $.remove(script);
- }
- clone.target = 'iframe';
- $.bind(clone, 'submit', qr.cb.submit);
- $.bind($('input[name=recaptcha_response_field]', clone), 'keydown', Recaptcha.listener);
- if (!g.REPLY) {
- xpath = 'preceding::span[@class="postername"][1]/preceding::input[1]';
- resto = $.el('input', {
- type: 'hidden',
- name: 'resto',
- value: $.x(xpath, link).name
+ if ($('.postarea label')) {
+ spoiler = $.el('label', {
+ innerHTML: " [
+ "
dialog = ui.dialog 'qr', top: '0px', left: '0px', html
- el = $ 'input[title=autohide]', dialog
+
+ $.bind $('input[name=name]', dialog), 'mousedown', (e) -> e.stopPropagation()
+ el = $ '#autohide', dialog
$.bind el, 'click', qr.cb.autohide
- clone = $('form[name=post]').cloneNode(true)
- for script in $$ 'script', clone
- $.remove script
- clone.target = 'iframe'
- $.bind clone, 'submit', qr.cb.submit
+ if $ '.postarea label'
+ spoiler = $.el 'label',
+ innerHTML: " [