From e64b01b6903c5b1f1498627db919a50c4e0ff88c Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Tue, 21 Apr 2015 01:39:44 +1000
Subject: Javascript ammendments, dio_ on Windows.
Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
---
js/infinite-scroll.js | 89 ++++++++++++++++++++++++++-------------------------
1 file changed, 45 insertions(+), 44 deletions(-)
(limited to 'js/infinite-scroll.js')
diff --git a/js/infinite-scroll.js b/js/infinite-scroll.js
index e212f9d6..b3c5c7ae 100644
--- a/js/infinite-scroll.js
+++ b/js/infinite-scroll.js
@@ -21,7 +21,7 @@ var activate = function() {
if (document.location.hash != '#all') return false;
$(window).on("scroll", function() {
- scrolltest();
+ scrolltest();
});
scrolltest();
@@ -30,53 +30,54 @@ var activate = function() {
var scrolltest = function() {
if ($(window).scrollTop() + $(window).height() + 1000 > $(document).height() && !loading) {
- load_next_page();
+ load_next_page();
}
};
var load_next_page = function() {
- if (loading) return;
- loading = true;
-
- var this_page = $(".pages a.selected:last");
- var next_page = this_page.next();
-
- var href = next_page.prop("href");
- if (!href) return;
-
- var boardheader = $('
'+_('Page')+' '+next_page.html()+'
');
- var loading_ind = $(''+_('Loading...')+'
').insertBefore('form[name="postcontrols"]>.delete:first');
-
- $.get(href, function(data) {
- var doc = $(data);
-
- loading_ind.remove();
- boardheader.insertBefore('form[name="postcontrols"]>.delete:first');
-
- var i = 0;
-
- doc.find('div[id*="thread_"]').each(function() {
- var checkout = $(this).attr('id').replace('thread_', '');
- var $this = this;
-
- if ($('div#thread_' + checkout).length == 0) {
- // Delay DOM insertion to lessen the lag.
- setTimeout(function() {
- $($this).insertBefore('form[name="postcontrols"]>.delete:first');
- $(document).trigger('new_post', $this);
- $($this).hide().slideDown();
- }, 500*i);
- i++;
- }
- });
- setTimeout(function() {
- loading = false;
- scrolltest();
- }, 500*(i+1));
-
- next_page.addClass('selected');
- });
-
+ if (loading) return;
+ loading = true;
+
+ var this_page = $(".pages a.selected:last");
+ var next_page = this_page.next();
+
+ var href = next_page.prop("href");
+ if (!href) return;
+
+ var boardheader = $(''+_('Page')+' '+next_page.html()+'
');
+ var loading_ind = $(''+_('Loading...')+'
').insertBefore('#post-moderation-fields');
+
+ $.get(href, function(data) {
+ var doc = $(data);
+
+ loading_ind.remove();
+ boardheader.insertBefore('#post-moderation-fields');
+
+ var i = 0;
+
+ doc.find('div[id*="thread_"]').each(function() {
+ var checkout = $(this).attr('id').replace('thread_', '');
+ var $this = this;
+
+ if ($('div#thread_' + checkout).length == 0) {
+ // Delay DOM insertion to lessen the lag.
+ setTimeout(function() {
+ $($this).insertBefore('#post-moderation-fields');
+ $(document).trigger('new_post', $this);
+ $($this).hide().slideDown();
+ }, 500*i);
+
+ i++;
+ }
+ });
+
+ setTimeout(function() {
+ loading = false;
+ scrolltest();
+ }, 500*(i+1));
+
+ next_page.addClass('selected');
+ });
};
var button = $(""+_("All")+" ").prependTo(".pages");
--
cgit v1.3