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

Merge branch 'v3'

Browse Source 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-03-07 17:19:29 -07:00
commit 53fe0ccabe
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -1,5 +1,5 @@
/* /*
* appchan x - Version 2.8.13 - 2014-03-06 * appchan x - Version 2.8.13 - 2014-03-07
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE

9
builds/appchan-x.user.js
View File

@ -24,7 +24,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* appchan x - Version 2.8.13 - 2014-03-06 * appchan x - Version 2.8.13 - 2014-03-07
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -11972,7 +11972,7 @@
return new Notice('info', "The thread is " + change + ".", 30); return new Notice('info', "The thread is " + change + ".", 30);
}, },
parse: function(postObjects) { parse: function(postObjects) {
var OP, count, deletedFiles, deletedPosts, files, index, node, num, post, postObject, posts, root, scroll, sendEvent, _i, _j, _len, _len1; var OP, count, deletedFiles, deletedPosts, files, index, node, num, post, postObject, posts, root, sendEvent, _i, _j, _len, _len1;
OP = postObjects[0]; OP = postObjects[0];
Build.spoilerRange[ThreadUpdater.thread.board] = OP.custom_spoiler; Build.spoilerRange[ThreadUpdater.thread.board] = OP.custom_spoiler;
ThreadUpdater.updateThreadStatus('Sticky', !!OP.sticky); ThreadUpdater.updateThreadStatus('Sticky', !!OP.sticky);
@ -12044,7 +12044,6 @@
} }
ThreadUpdater.lastPost = posts[count - 1].ID; ThreadUpdater.lastPost = posts[count - 1].ID;
Main.callbackNodes(Post, posts); Main.callbackNodes(Post, posts);
scroll = Conf['Auto Scroll'] && ThreadUpdater.scrollBG() && Header.getBottomOf(ThreadUpdater.root) > -25;
for (_j = 0, _len1 = posts.length; _j < _len1; _j++) { for (_j = 0, _len1 = posts.length; _j < _len1; _j++) {
post = posts[_j]; post = posts[_j];
root = post.nodes.root; root = post.nodes.root;
@ -12057,11 +12056,11 @@
} }
} }
sendEvent(); sendEvent();
if (scroll) { if (Conf['Auto Scroll'] && ThreadUpdater.scrollBG() && Header.getBottomOf(ThreadUpdater.root) > -25) {
if (Conf['Bottom Scroll']) { if (Conf['Bottom Scroll']) {
return window.scrollTo(0, d.body.clientHeight); return window.scrollTo(0, d.body.clientHeight);
} else { } else {
return Header.scrollTo(nodes[0]); return Header.scrollTo(posts.nodes[0]);
} }
} }
} }

9
builds/crx/script.js
View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript // Generated by CoffeeScript
/* /*
* appchan x - Version 2.8.13 - 2014-03-06 * appchan x - Version 2.8.13 - 2014-03-07
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -11987,7 +11987,7 @@
return new Notice('info', "The thread is " + change + ".", 30); return new Notice('info', "The thread is " + change + ".", 30);
}, },
parse: function(postObjects) { parse: function(postObjects) {
var OP, count, deletedFiles, deletedPosts, files, index, node, num, post, postObject, posts, root, scroll, sendEvent, _i, _j, _len, _len1; var OP, count, deletedFiles, deletedPosts, files, index, node, num, post, postObject, posts, root, sendEvent, _i, _j, _len, _len1;
OP = postObjects[0]; OP = postObjects[0];
Build.spoilerRange[ThreadUpdater.thread.board] = OP.custom_spoiler; Build.spoilerRange[ThreadUpdater.thread.board] = OP.custom_spoiler;
ThreadUpdater.updateThreadStatus('Sticky', !!OP.sticky); ThreadUpdater.updateThreadStatus('Sticky', !!OP.sticky);
@ -12059,7 +12059,6 @@
} }
ThreadUpdater.lastPost = posts[count - 1].ID; ThreadUpdater.lastPost = posts[count - 1].ID;
Main.callbackNodes(Post, posts); Main.callbackNodes(Post, posts);
scroll = Conf['Auto Scroll'] && ThreadUpdater.scrollBG() && Header.getBottomOf(ThreadUpdater.root) > -25;
for (_j = 0, _len1 = posts.length; _j < _len1; _j++) { for (_j = 0, _len1 = posts.length; _j < _len1; _j++) {
post = posts[_j]; post = posts[_j];
root = post.nodes.root; root = post.nodes.root;
@ -12072,11 +12071,11 @@
} }
} }
sendEvent(); sendEvent();
if (scroll) { if (Conf['Auto Scroll'] && ThreadUpdater.scrollBG() && Header.getBottomOf(ThreadUpdater.root) > -25) {
if (Conf['Bottom Scroll']) { if (Conf['Bottom Scroll']) {
return window.scrollTo(0, d.body.clientHeight); return window.scrollTo(0, d.body.clientHeight);
} else { } else {
return Header.scrollTo(nodes[0]); return Header.scrollTo(posts.nodes[0]);
} }
} }
} }

6
src/Monitoring/ThreadUpdater.coffee
View File

@ -335,8 +335,6 @@ ThreadUpdater =
ThreadUpdater.lastPost = posts[count - 1].ID ThreadUpdater.lastPost = posts[count - 1].ID
Main.callbackNodes Post, posts Main.callbackNodes Post, posts
scroll = Conf['Auto Scroll'] and ThreadUpdater.scrollBG() and Header.getBottomOf(ThreadUpdater.root) > -25
for post in posts for post in posts
{root} = post.nodes {root} = post.nodes
if post.cb if post.cb
@ -346,8 +344,8 @@ ThreadUpdater =
$.add ThreadUpdater.root, root $.add ThreadUpdater.root, root
sendEvent() sendEvent()
if scroll if Conf['Auto Scroll'] and ThreadUpdater.scrollBG() and Header.getBottomOf(ThreadUpdater.root) > -25
if Conf['Bottom Scroll'] if Conf['Bottom Scroll']
window.scrollTo 0, d.body.clientHeight window.scrollTo 0, d.body.clientHeight
else else
Header.scrollTo nodes[0] Header.scrollTo posts.nodes[0]