Merge branch 'v3'

This commit is contained in:
Zixaphir 2013-08-08 17:01:51 -07:00
commit f035dabb9d
4 changed files with 54 additions and 40 deletions

View File

@ -7968,20 +7968,24 @@
i = 0;
while (post = posts[i]) {
bottom = post.nodes.root.getBoundingClientRect().bottom;
if (bottom > height) {
i++;
continue;
}
ID = post.ID;
if (Conf['Quote Threading']) {
posts.splice(i, 1);
continue;
if (bottom < height) {
ID = post.ID;
if (Conf['Quote Threading']) {
posts.splice(i, 1);
continue;
}
} else {
posts.splice(0, i);
break;
if (!Conf['Quote Threading']) {
break;
}
}
i++;
}
if (!Conf['Quote Threading']) {
if (i) {
posts.splice(0, i);
}
}
if (!ID) {
return;
}

View File

@ -10300,20 +10300,24 @@
i = 0;
while (post = posts[i]) {
bottom = post.nodes.root.getBoundingClientRect().bottom;
if (bottom > height) {
i++;
continue;
}
ID = post.ID;
if (Conf['Quote Threading']) {
posts.splice(i, 1);
continue;
if (bottom < height) {
ID = post.ID;
if (Conf['Quote Threading']) {
posts.splice(i, 1);
continue;
}
} else {
posts.splice(0, i);
break;
if (!Conf['Quote Threading']) {
break;
}
}
i++;
}
if (!Conf['Quote Threading']) {
if (i) {
posts.splice(0, i);
}
}
if (!ID) {
return;
}

View File

@ -10283,20 +10283,24 @@
i = 0;
while (post = posts[i]) {
bottom = post.nodes.root.getBoundingClientRect().bottom;
if (bottom > height) {
i++;
continue;
}
ID = post.ID;
if (Conf['Quote Threading']) {
posts.splice(i, 1);
continue;
if (bottom < height) {
ID = post.ID;
if (Conf['Quote Threading']) {
posts.splice(i, 1);
continue;
}
} else {
posts.splice(0, i);
break;
if (!Conf['Quote Threading']) {
break;
}
}
i++;
}
if (!Conf['Quote Threading']) {
if (i) {
posts.splice(0, i);
}
}
if (!ID) {
return;
}

View File

@ -123,18 +123,20 @@ Unread =
while post = posts[i]
{bottom} = post.nodes.root.getBoundingClientRect()
if bottom > height # post isnt completely read
i++
continue
{ID} = post
if Conf['Quote Threading']
posts.splice i, 1
continue
if bottom < height # post is completely read
{ID} = post
if Conf['Quote Threading']
posts.splice i, 1
continue
else
posts.splice 0, i
break
unless Conf['Quote Threading']
break
i++
unless Conf['Quote Threading']
if i
posts.splice 0, i
return unless ID
Unread.lastReadPost = ID if Unread.lastReadPost < ID or !Unread.lastReadPost