Skip to content

Commit b8e26d6

Browse files
dolymooddolymood
committed
build: package
1 parent 476538c commit b8e26d6

File tree

14 files changed

+33
-30
lines changed

14 files changed

+33
-30
lines changed

‎lib/cube.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/drawer/drawer.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/drawer/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5943,7 +5943,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
59435943

59445944
this.scroll = new _betterScroll2.default(this.$refs.wrapper, options);
59455945

5946-
this.parentScroll && this._handleNestScroll();
5946+
this.parentScroll && this.nestMode !== 'none' && this._handleNestScroll();
59475947

59485948
this._listenScrollEvents();
59495949

@@ -6038,11 +6038,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
60386038
});
60396039

60406040
innerScroll.on('scroll', function (pos) {
6041-
if (_this5.nestMode === NEST_MODE_NATIVE && !_this5.touchStartMoment) {
6041+
if (!innerScroll.initiated || innerScroll.isInTransition) {
60426042
return;
60436043
}
60446044

6045-
if (innerScroll.isInTransition) {
6045+
if (_this5.nestMode === NEST_MODE_NATIVE && !_this5.touchStartMoment) {
60466046
return;
60476047
}
60486048

‎lib/image-preview/image-preview.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/image-preview/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6365,7 +6365,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
63656365

63666366
this.scroll = new _betterScroll2.default(this.$refs.wrapper, options);
63676367

6368-
this.parentScroll && this._handleNestScroll();
6368+
this.parentScroll && this.nestMode !== 'none' && this._handleNestScroll();
63696369

63706370
this._listenScrollEvents();
63716371

@@ -6460,11 +6460,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
64606460
});
64616461

64626462
innerScroll.on('scroll', function (pos) {
6463-
if (_this5.nestMode === NEST_MODE_NATIVE && !_this5.touchStartMoment) {
6463+
if (!innerScroll.initiated || innerScroll.isInTransition) {
64646464
return;
64656465
}
64666466

6467-
if (innerScroll.isInTransition) {
6467+
if (_this5.nestMode === NEST_MODE_NATIVE && !_this5.touchStartMoment) {
64686468
return;
64696469
}
64706470

‎lib/index-list/index-list.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/index-list/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5625,7 +5625,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
56255625

56265626
this.scroll = new _betterScroll2.default(this.$refs.wrapper, options);
56275627

5628-
this.parentScroll && this._handleNestScroll();
5628+
this.parentScroll && this.nestMode !== 'none' && this._handleNestScroll();
56295629

56305630
this._listenScrollEvents();
56315631

@@ -5720,11 +5720,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
57205720
});
57215721

57225722
innerScroll.on('scroll', function (pos) {
5723-
if (_this5.nestMode === NEST_MODE_NATIVE && !_this5.touchStartMoment) {
5723+
if (!innerScroll.initiated || innerScroll.isInTransition) {
57245724
return;
57255725
}
57265726

5727-
if (innerScroll.isInTransition) {
5727+
if (_this5.nestMode === NEST_MODE_NATIVE && !_this5.touchStartMoment) {
57285728
return;
57295729
}
57305730

‎lib/index.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6839,7 +6839,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
68396839
}
68406840

68416841
var Cube = {
6842-
version: "1.11.1",
6842+
version: "1.11.2",
68436843
install: install,
68446844
BScroll: _module.BetterScroll,
68456845
createAPI: _module.createAPI
@@ -17415,7 +17415,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
1741517415

1741617416
this.scroll = new _betterScroll2.default(this.$refs.wrapper, options);
1741717417

17418-
this.parentScroll && this._handleNestScroll();
17418+
this.parentScroll && this.nestMode !== 'none' && this._handleNestScroll();
1741917419

1742017420
this._listenScrollEvents();
1742117421

@@ -17510,11 +17510,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
1751017510
});
1751117511

1751217512
innerScroll.on('scroll', function (pos) {
17513-
if (_this5.nestMode === NEST_MODE_NATIVE && !_this5.touchStartMoment) {
17513+
if (!innerScroll.initiated || innerScroll.isInTransition) {
1751417514
return;
1751517515
}
1751617516

17517-
if (innerScroll.isInTransition) {
17517+
if (_this5.nestMode === NEST_MODE_NATIVE && !_this5.touchStartMoment) {
1751817518
return;
1751917519
}
1752017520

@@ -21314,6 +21314,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
2131421314
}, [_c('cube-scroll', {
2131521315
ref: "scroll",
2131621316
attrs: {
21317+
"nestMode": "none",
2131721318
"options": _vm.options,
2131821319
"direction": _vm.direction
2131921320
}

‎lib/scroll-nav-bar/index.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5625,7 +5625,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
56255625

56265626
this.scroll = new _betterScroll2.default(this.$refs.wrapper, options);
56275627

5628-
this.parentScroll && this._handleNestScroll();
5628+
this.parentScroll && this.nestMode !== 'none' && this._handleNestScroll();
56295629

56305630
this._listenScrollEvents();
56315631

@@ -5720,11 +5720,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
57205720
});
57215721

57225722
innerScroll.on('scroll', function (pos) {
5723-
if (_this5.nestMode === NEST_MODE_NATIVE && !_this5.touchStartMoment) {
5723+
if (!innerScroll.initiated || innerScroll.isInTransition) {
57245724
return;
57255725
}
57265726

5727-
if (innerScroll.isInTransition) {
5727+
if (_this5.nestMode === NEST_MODE_NATIVE && !_this5.touchStartMoment) {
57285728
return;
57295729
}
57305730

@@ -6401,6 +6401,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
64016401
}, [_c('cube-scroll', {
64026402
ref: "scroll",
64036403
attrs: {
6404+
"nestMode": "none",
64046405
"options": _vm.options,
64056406
"direction": _vm.direction
64066407
}

‎lib/scroll-nav-bar/scroll-nav-bar.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)