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

Keybinds and navigation fixes.

Browse Source
This commit is contained in:
Nicolas Stepien 2012-05-09 09:40:54 +02:00
parent af9b5139d0
commit 2af993300c
2 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
4chan_x.user.js
View File

@ -1258,13 +1258,13 @@
if (all) {
return $.id('imageExpand').click();
} else {
thumb = $('img[data-md5]', $('.replyhl', thread) || thread);
thumb = $('img[data-md5]', $('.post.highlight', thread) || thread);
return ImageExpand.toggle(thumb.parentNode);
}
},
qr: function(thread, quote) {
if (quote) {
QR.quote.call($('.quotejs + .quotejs', $('.replyhl', thread) || thread));
QR.quote.call($('.postInfo > .postNum > a[title="Quote this post"]', $('.post.highlight', thread) || thread));
} else {
QR.open();
}
@ -1272,7 +1272,7 @@
},
open: function(thread, tab) {
var id, url;
id = thread.firstChild.id;
id = thread.id.slice(1);
url = "//boards.4chan.org/" + g.BOARD + "/res/" + id;
if (tab) {
return $.open(url);
@ -1281,17 +1281,15 @@
}
},
hl: function(delta, thread) {
var next, rect, replies, reply, td, _i, _len;
if (td = $('.replyhl', thread)) {
td.className = 'reply';
td.removeAttribute('tabindex');
rect = td.getBoundingClientRect();
var next, post, rect, replies, reply, _i, _len;
if (post = $('.reply.highlight', thread)) {
$.removeClass(post, 'highlight');
post.removeAttribute('tabindex');
rect = post.getBoundingClientRect();
if (rect.bottom >= 0 && rect.top <= d.documentElement.clientHeight) {
next = delta === +1 ? $.x('following::td[@class="reply"]', td) : $.x('preceding::td[@class="reply"]', td);
next = delta === +1 ? $.x('parent::div/following-sibling::div/div[contains(@class,"reply")]', post) : $.x('parent::div/preceding-sibling::div/div[contains(@class,"reply")]', post);
if (!next) {
td.className = 'replyhl';
td.tabIndex = 0;
td.focus();
this.focus(post);
return;
}
if (!(g.REPLY || $.x('ancestor::div[@class="thread"]', next) === thread)) {
@ -1301,9 +1299,7 @@
if (rect.top < 0 || rect.bottom > d.documentElement.clientHeight) {
next.scrollIntoView(delta === -1);
}
next.className = 'replyhl';
next.tabIndex = 0;
next.focus();
this.focus(next);
return;
}
}
@ -1315,12 +1311,15 @@
reply = replies[_i];
rect = reply.getBoundingClientRect();
if (delta === +1 && rect.top >= 0 || delta === -1 && rect.bottom <= d.documentElement.clientHeight) {
reply.className = 'replyhl';
reply.tabIndex = 0;
reply.focus();
this.focus(reply);
return;
}
}
},
focus: function(post) {
$.addClass(post, 'highlight');
post.tabIndex = 0;
return post.focus();
}
};
@ -1372,7 +1371,7 @@
return thread;
}
}
return $('form[name=delform]');
return $('.board');
},
scroll: function(delta) {
var i, rect, thread, top, _ref, _ref1;

37
script.coffee
View File

@ -944,18 +944,18 @@ Keybinds =
if all
$.id('imageExpand').click()
else
thumb = $ 'img[data-md5]', $('.replyhl', thread) or thread
thumb = $ 'img[data-md5]', $('.post.highlight', thread) or thread
ImageExpand.toggle thumb.parentNode
qr: (thread, quote) ->
if quote
QR.quote.call $ '.quotejs + .quotejs', $('.replyhl', thread) or thread
QR.quote.call $ '.postInfo > .postNum > a[title="Quote this post"]', $('.post.highlight', thread) or thread
else
QR.open()
$('textarea', QR.el).focus()
open: (thread, tab) ->
id = thread.firstChild.id
id = thread.id[1..]
url = "//boards.4chan.org/#{g.BOARD}/res/#{id}"
if tab
$.open url
@ -963,28 +963,24 @@ Keybinds =
location.href = url
hl: (delta, thread) ->
if td = $ '.replyhl', thread
td.className = 'reply'
td.removeAttribute 'tabindex'
rect = td.getBoundingClientRect()
if post = $ '.reply.highlight', thread
$.removeClass post, 'highlight'
post.removeAttribute 'tabindex'
rect = post.getBoundingClientRect()
if rect.bottom >= 0 and rect.top <= d.documentElement.clientHeight # We're at least partially visible
next =
if delta is +1
$.x 'following::td[@class="reply"]', td
$.x 'parent::div/following-sibling::div/div[contains(@class,"reply")]', post
else
$.x 'preceding::td[@class="reply"]', td
$.x 'parent::div/preceding-sibling::div/div[contains(@class,"reply")]', post
unless next
td.className = 'replyhl'
td.tabIndex = 0
td.focus()
@focus post
return
return unless g.REPLY or $.x('ancestor::div[@class="thread"]', next) is thread
rect = next.getBoundingClientRect()
if rect.top < 0 or rect.bottom > d.documentElement.clientHeight
next.scrollIntoView delta is -1
next.className = 'replyhl'
next.tabIndex = 0
next.focus()
@focus next
return
replies = $$ '.reply', thread
@ -992,11 +988,14 @@ Keybinds =
for reply in replies
rect = reply.getBoundingClientRect()
if delta is +1 and rect.top >= 0 or delta is -1 and rect.bottom <= d.documentElement.clientHeight
reply.className = 'replyhl'
reply.tabIndex = 0
reply.focus()
@focus reply
return
focus: (post) ->
$.addClass post, 'highlight'
post.tabIndex = 0
post.focus()
Nav =
# ◀ ▶
init: ->
@ -1036,7 +1035,7 @@ Nav =
if full
return [thread, i, rect]
return thread
return $ 'form[name=delform]'
return $ '.board'
scroll: (delta) ->
[thread, i, rect] = Nav.getThread true