Merge branch 'develop' into vue3

2020-08-19 22:15:04 +09:00
parent 5f1bcdc423 c34f302b1c
commit fc09479d0a
119 changed files with 3454 additions and 640 deletions
--- a/src/client/scripts/paging.ts
+++ b/src/client/scripts/paging.ts
@@ -1,4 +1,4 @@
-import { getScrollPosition, onScrollTop } from './scroll';
+import { onScrollTop, isTopVisible } from './scroll';

 const SECOND_FETCH_LIMIT = 30;

@@ -147,7 +147,7 @@ export default (opts) => ({
 		},

 		prepend(item) {
-			const isTop = this.isBackTop || (document.body.contains(this.$el) && (getScrollPosition(this.$el) === 0));
+			const isTop = this.isBackTop || (document.body.contains(this.$el) && isTopVisible(this.$el));

 			if (isTop) {
 				// Prepend the item