summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--css/app.css5
-rw-r--r--js/directive/NewsScroll.js8
2 files changed, 10 insertions, 3 deletions
diff --git a/css/app.css b/css/app.css
index b0eaa3fa8..e3b96fc84 100644
--- a/css/app.css
+++ b/css/app.css
@@ -42,4 +42,9 @@
#searchbox {
display: block !important;
+}
+
+/* Override hidden before angular is loaded */
+[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak, .ng-hide:not(.ng-hide-animate) {
+ display: none !important;
} \ No newline at end of file
diff --git a/js/directive/NewsScroll.js b/js/directive/NewsScroll.js
index d83317fcb..44271b72b 100644
--- a/js/directive/NewsScroll.js
+++ b/js/directive/NewsScroll.js
@@ -47,9 +47,11 @@ app.directive('newsScroll', function ($timeout, ITEM_AUTO_PAGE_SIZE,
var articles = elem.querySelectorAll('.item:not(.read)');
articles.forEach(function(article) {
- var distTop = article.getBoundingClientRect().top;
- var scrollTop = $(document).scrollTop();
- if (distTop - scrollTop <= -10) {
+ // distance to top + height
+ var distTop = article.offsetTop + article.offsetHeight;
+ var scrollTop = window.pageYOffset ||
+ document.documentElement.scrollTop;
+ if (distTop < scrollTop) {
ids.push(parseInt(article.dataset.id, 10));
} else {
return false;