Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts: .gitattributes src/Posting/QuickReply.coffee
This commit is contained in:
commit
4317526923
@ -4770,7 +4770,8 @@
|
|||||||
if (Conf['QR Shortcut']) {
|
if (Conf['QR Shortcut']) {
|
||||||
$.toggleClass($('.qr-shortcut'), 'disabled');
|
$.toggleClass($('.qr-shortcut'), 'disabled');
|
||||||
}
|
}
|
||||||
_ref = QR.posts.splice(0, QR.posts.length, new QR.post(true));
|
new QR.post(true);
|
||||||
|
_ref = QR.posts.splice(0, QR.posts.length - 1);
|
||||||
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
||||||
post = _ref[_i];
|
post = _ref[_i];
|
||||||
post["delete"]();
|
post["delete"]();
|
||||||
|
|||||||
@ -4771,7 +4771,8 @@
|
|||||||
if (Conf['QR Shortcut']) {
|
if (Conf['QR Shortcut']) {
|
||||||
$.toggleClass($('.qr-shortcut'), 'disabled');
|
$.toggleClass($('.qr-shortcut'), 'disabled');
|
||||||
}
|
}
|
||||||
_ref = QR.posts.splice(0, QR.posts.length, new QR.post(true));
|
new QR.post(true);
|
||||||
|
_ref = QR.posts.splice(0, QR.posts.length - 1);
|
||||||
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
||||||
post = _ref[_i];
|
post = _ref[_i];
|
||||||
post["delete"]();
|
post["delete"]();
|
||||||
|
|||||||
@ -101,7 +101,8 @@ QR =
|
|||||||
$.rmClass QR.captcha.nodes.input, 'error'
|
$.rmClass QR.captcha.nodes.input, 'error'
|
||||||
if Conf['QR Shortcut']
|
if Conf['QR Shortcut']
|
||||||
$.toggleClass $('.qr-shortcut'), 'disabled'
|
$.toggleClass $('.qr-shortcut'), 'disabled'
|
||||||
for post in QR.posts.splice 0, QR.posts.length, new QR.post true
|
new QR.post true
|
||||||
|
for post in QR.posts.splice 0, QR.posts.length - 1
|
||||||
post.delete()
|
post.delete()
|
||||||
QR.cooldown.auto = false
|
QR.cooldown.auto = false
|
||||||
QR.status()
|
QR.status()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user