Skip to content

Commit d44585d

Browse files
dolymooddolymood
committed
publish build
1 parent 07eb24e commit d44585d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+499
-254
lines changed

‎lib/better-scroll/better-scroll.min.js‎

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

‎lib/better-scroll/index.js‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
111111
"use strict";
112112
Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
113113
/*!
114-
* better-normal-scroll v1.8.1
114+
* better-normal-scroll v1.8.4
115115
* (c) 2016-2018 ustbhuangyi
116116
* Released under the MIT License.
117117
*/
@@ -410,18 +410,28 @@ function click(e) {
410410
var ev = void 0;
411411
var event = 'click';
412412
var bubbles = true;
413-
// cancelable set to false in case of the conflict with fastclick
414-
var cancelable = false;
413+
var cancelable = true;
415414
if (typeof MouseEvent !== 'undefined') {
416-
ev = new MouseEvent(event, extend({
417-
bubbles: bubbles,
418-
cancelable: cancelable
419-
}, posSrc));
415+
try {
416+
ev = new MouseEvent(event, extend({
417+
bubbles: bubbles,
418+
cancelable: cancelable
419+
}, posSrc));
420+
} catch (e) {
421+
createEvent();
422+
}
420423
} else {
424+
createEvent();
425+
}
426+
427+
function createEvent() {
421428
ev = document.createEvent('Event');
422429
ev.initEvent(event, bubbles, cancelable);
423430
extend(ev, posSrc);
424431
}
432+
433+
// forwardedTouchEvent set to true in case of the conflict with fastclick
434+
ev.forwardedTouchEvent = true;
425435
ev._constructed = true;
426436
e.target.dispatchEvent(ev);
427437
}
@@ -453,7 +463,7 @@ var DEFAULT_OPTIONS = {
453463
click: false,
454464
tap: false,
455465
bounce: true,
456-
bounceTime: 700,
466+
bounceTime: 800,
457467
momentum: true,
458468
momentumLimitTime: 300,
459469
momentumLimitDistance: 15,
@@ -917,10 +927,10 @@ function momentum(current, start, time, lowerMargin, wrapperSize, options) {
917927
}
918928

919929
if (destination < lowerMargin) {
920-
destination = wrapperSize ? lowerMargin - wrapperSize / rate * speed : lowerMargin;
930+
destination = wrapperSize ? Math.max(lowerMargin - wrapperSize / 4, lowerMargin - wrapperSize / rate * speed) : lowerMargin;
921931
duration = swipeBounceTime;
922932
} else if (destination > 0) {
923-
destination = wrapperSize ? wrapperSize / rate * speed : 0;
933+
destination = wrapperSize ? Math.min(wrapperSize / 4, wrapperSize / rate * speed) : 0;
924934
duration = swipeBounceTime;
925935
}
926936

@@ -2581,7 +2591,7 @@ pullDownMixin(BScroll);
25812591
pullUpMixin(BScroll);
25822592
mouseWheelMixin(BScroll);
25832593

2584-
BScroll.Version = '1.8.1';
2594+
BScroll.Version = '1.8.4';
25852595

25862596
/* harmony default export */ __webpack_exports__["default"] = (BScroll);
25872597

‎lib/cascade-picker/cascade-picker.min.js‎

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

‎lib/cascade-picker/index.js‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,7 +1387,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
13871387
"use strict";
13881388
Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
13891389
/*!
1390-
* better-normal-scroll v1.8.1
1390+
* better-normal-scroll v1.8.4
13911391
* (c) 2016-2018 ustbhuangyi
13921392
* Released under the MIT License.
13931393
*/
@@ -1686,18 +1686,28 @@ function click(e) {
16861686
var ev = void 0;
16871687
var event = 'click';
16881688
var bubbles = true;
1689-
// cancelable set to false in case of the conflict with fastclick
1690-
var cancelable = false;
1689+
var cancelable = true;
16911690
if (typeof MouseEvent !== 'undefined') {
1692-
ev = new MouseEvent(event, extend({
1693-
bubbles: bubbles,
1694-
cancelable: cancelable
1695-
}, posSrc));
1691+
try {
1692+
ev = new MouseEvent(event, extend({
1693+
bubbles: bubbles,
1694+
cancelable: cancelable
1695+
}, posSrc));
1696+
} catch (e) {
1697+
createEvent();
1698+
}
16961699
} else {
1700+
createEvent();
1701+
}
1702+
1703+
function createEvent() {
16971704
ev = document.createEvent('Event');
16981705
ev.initEvent(event, bubbles, cancelable);
16991706
extend(ev, posSrc);
17001707
}
1708+
1709+
// forwardedTouchEvent set to true in case of the conflict with fastclick
1710+
ev.forwardedTouchEvent = true;
17011711
ev._constructed = true;
17021712
e.target.dispatchEvent(ev);
17031713
}
@@ -1729,7 +1739,7 @@ var DEFAULT_OPTIONS = {
17291739
click: false,
17301740
tap: false,
17311741
bounce: true,
1732-
bounceTime: 700,
1742+
bounceTime: 800,
17331743
momentum: true,
17341744
momentumLimitTime: 300,
17351745
momentumLimitDistance: 15,
@@ -2193,10 +2203,10 @@ function momentum(current, start, time, lowerMargin, wrapperSize, options) {
21932203
}
21942204

21952205
if (destination < lowerMargin) {
2196-
destination = wrapperSize ? lowerMargin - wrapperSize / rate * speed : lowerMargin;
2206+
destination = wrapperSize ? Math.max(lowerMargin - wrapperSize / 4, lowerMargin - wrapperSize / rate * speed) : lowerMargin;
21972207
duration = swipeBounceTime;
21982208
} else if (destination > 0) {
2199-
destination = wrapperSize ? wrapperSize / rate * speed : 0;
2209+
destination = wrapperSize ? Math.min(wrapperSize / 4, wrapperSize / rate * speed) : 0;
22002210
duration = swipeBounceTime;
22012211
}
22022212

@@ -3857,7 +3867,7 @@ pullDownMixin(BScroll);
38573867
pullUpMixin(BScroll);
38583868
mouseWheelMixin(BScroll);
38593869

3860-
BScroll.Version = '1.8.1';
3870+
BScroll.Version = '1.8.4';
38613871

38623872
/* harmony default export */ __webpack_exports__["default"] = (BScroll);
38633873

‎lib/checkbox-group/checkbox-group.min.css‎

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)