Skip to content

Commit eb5a7bb

Browse files
authored
Merge pull request ustbhuangyi#291 from wind-stone/master-huangyi
有过渡滚动时,增加 transitionProperty = ‘transform’
2 parents 45d7cef + 25b9a9f commit eb5a7bb

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

src/scroll/core.js

+5
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,10 @@ export function coreMixin(BScroll) {
330330
}
331331
}
332332

333+
BScroll.prototype._transitionProperty = function (property = 'transform') {
334+
this.scrollerStyle[style.transitionProperty] = property
335+
}
336+
333337
BScroll.prototype._transitionTime = function (time = 0) {
334338
this.scrollerStyle[style.transitionDuration] = time + 'ms'
335339

@@ -462,6 +466,7 @@ export function coreMixin(BScroll) {
462466
this.isInTransition = this.options.useTransition && time > 0 && (x !== this.x || y !== this.y)
463467

464468
if (!time || this.options.useTransition) {
469+
this._transitionProperty()
465470
this._transitionTimingFunction(easing.style)
466471
this._transitionTime(time)
467472
this._translate(x, y)

src/util/dom.js

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ export const style = {
6565
transform,
6666
transitionTimingFunction: prefixStyle('transitionTimingFunction'),
6767
transitionDuration: prefixStyle('transitionDuration'),
68+
transitionProperty: prefixStyle('transitionProperty'),
6869
transitionDelay: prefixStyle('transitionDelay'),
6970
transformOrigin: prefixStyle('transformOrigin'),
7071
transitionEnd: prefixStyle('transitionEnd')

0 commit comments

Comments
 (0)