ui/vant
1
0
Fork 0
mirror of https://github.com/youzan/vant.git synced 2025-10-22 11:54:02 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

[improvement] sort out utils (#2672)

Browse Source
This commit is contained in:
neverland
2019-02-02 10:41:01 +08:00
committed by GitHub
parent 0eb06b10a8
commit f0056297c6
9 changed files with 93 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/waterfall/directive.js
View File

@@ -1,6 +1,11 @@
/* eslint-disable no-underscore-dangle */
import Utils from '../utils/scroll';
import { on, off } from '../utils/event';
import {
getScrollTop,
getElementTop,
getVisibleHeight,
getScrollEventTarget
} from '../utils/scroll';
const CONTEXT = '@@Waterfall';
const OFFSET = 300;
@@ -12,8 +17,8 @@ function handleScrollEvent() {
// 已被禁止的滚动处理
if (this.disabled) return;
const targetScrollTop = Utils.getScrollTop(scrollEventTarget);
const targetVisibleHeight = Utils.getVisibleHeight(scrollEventTarget);
const targetScrollTop = getScrollTop(scrollEventTarget);
const targetVisibleHeight = getVisibleHeight(scrollEventTarget);
// 滚动元素可视区域下边沿到滚动元素元素最顶上 距离
const targetBottom = targetScrollTop + targetVisibleHeight;
@@ -25,7 +30,8 @@ function handleScrollEvent() {
if (element === scrollEventTarget) {
needLoadMoreToLower = scrollEventTarget.scrollHeight - targetBottom < this.offset;
} else {
const elementBottom = Utils.getElementTop(element) - Utils.getElementTop(scrollEventTarget) + Utils.getVisibleHeight(element);
const elementBottom =
getElementTop(element) - getElementTop(scrollEventTarget) + getVisibleHeight(element);
needLoadMoreToLower = elementBottom - targetVisibleHeight < this.offset;
}
if (needLoadMoreToLower) {
@@ -37,7 +43,7 @@ function handleScrollEvent() {
if (element === scrollEventTarget) {
needLoadMoreToUpper = targetScrollTop < this.offset;
} else {
const elementTop = Utils.getElementTop(element) - Utils.getElementTop(scrollEventTarget);
const elementTop = getElementTop(element) - getElementTop(scrollEventTarget);
needLoadMoreToUpper = elementTop + this.offset > 0;
}
if (needLoadMoreToUpper) {
@@ -54,12 +60,12 @@ function doBindEvent() {
this.el[CONTEXT].binded = true;
this.scrollEventListener = handleScrollEvent.bind(this);
this.scrollEventTarget = Utils.getScrollEventTarget(this.el);
this.scrollEventTarget = getScrollEventTarget(this.el);
const disabledExpr = this.el.getAttribute('waterfall-disabled');
let disabled = false;
if (disabledExpr) {
this.vm.$watch(disabledExpr, (value) => {
this.vm.$watch(disabledExpr, value => {
this.disabled = value;
this.scrollEventListener();
});