Fix FF scrolltop

HelloZeroNet · Jul 19, 2017 · 8a08df4 · 8a08df4
1 parent 6a05d7a
commit 8a08df4
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 36 deletions.
diff --git a/content.json b/content.json
@@ -20,12 +20,12 @@
    "size": 1002
   },
   "index.html": {
-   "sha512": "286429e92750c926c5631d6132a9ac42766bc1503375d6be1e1a52ccd0ed6917",
-   "size": 1093
+   "sha512": "71ee28e63a2d5cb58ffa5b3562380798345bb1b4abcce6809bf36a4a200540eb",
+   "size": 1092
   },
   "js/all.js": {
-   "sha512": "155e4acb237e8253e99a47726409ec05daf475d978c622266ab194ea1b21f86c",
-   "size": 186385
+   "sha512": "12bb9db6480bb0c91b8ca716abd7da913f424883f0226d0639745225319209f7",
+   "size": 186802
   },
   "languages/da.json": {
    "sha512": "aec7f0efc03710ad27013facfebdc4c2e3b938ebcf67e257fa2fb432c47b6842",
@@ -98,14 +98,14 @@
  },
  "ignore": "(js|css)/(?!all.(js|css))",
  "inner_path": "content.json",
- "modified": 1497558284,
+ "modified": 1500470633,
  "postmessage_nonce_security": true,
  "signers_sign": "HLcq242ZHh4nTexhe6kvkBroycZ1JpF4pjlLGxbhjKAwDAfdCZ/gxUwM9aIN6OrD8K5YqAfvIVlbwkLMB1XSEDo=",
  "signs": {
-  "1HeLLo4uzjaLetFx6NH3PMwFP3qbRbTf3D": "HB5xtjdOuA7bpGBAOoJAof9/+0Ohki9LOCDErfPszhY7TJpcjDJZnsuBOpHzeG5hE6QriKwcKUm/KhRy+ZHs3Ik="
+  "1HeLLo4uzjaLetFx6NH3PMwFP3qbRbTf3D": "G6HmwR3S1WXCtvPJ1W6ohsXpkjpiN8Y9K69ivK6jx/CYdPQ0PAR+scV4fyVQlx/isHZnDlzJekMpJVApZf+s4e8="
  },
  "signs_required": 1,
  "title": "ZeroHello",
  "translate": ["js/all.js"],
- "zeronet_version": "0.5.5"
+ "zeronet_version": "0.5.6"
 }
diff --git a/index.html b/index.html
@@ -38,6 +38,5 @@
 -->
 
 <script type="text/javascript" src="js/all.js?lang={lang}"></script>
-
 </body>
 </html>
diff --git a/js/FeedList.coffee b/js/FeedList.coffee
@@ -18,7 +18,8 @@ class FeedList extends Class
 		@
 
 	checkScroll: =>
-		if document.body.scrollTop + window.innerHeight > document.getElementById("FeedList").clientHeight - 400 and not @updating and @feeds?.length > 5 and Page.mode == "Sites" and @limit < 300
+		scroll_top = window.pageYOffset or document.documentElement.scrollTop or document.body.scrollTop or 0
+		if scroll_top + window.innerHeight > document.getElementById("FeedList").clientHeight - 400 and not @updating and @feeds?.length > 5 and Page.mode == "Sites" and @limit < 300
 			@limit += 30
 			@query_limit += 30
 			@query_day_limit += 5