Merge branch 'master' of https://github.com/ustbhuangyi/better-scroll

Author: ustbhuangyi

README.md

@@ -1,7 +1,7 @@
 # better-scroll
 [![npm](https://img.shields.io/npm/v/better-scroll.svg?style=flat-square)](https://www.npmjs.com/package/better-scroll)
 
-inspired by iscroll, and it has a better scroll perfermance
+inspired by iscroll, and it has a better scroll perfermance https://ustbhuangyi.github.io/better-scroll/
 
 ## 立即使用
 
@@ -43,7 +43,7 @@ var BScroll = require('better-scroll')
 ```
 
 ## DEMO
-better-scroll的源码是基于webpack构建的
+better-scroll 的源码是基于 Webpack 构建的
 
 首先，clone项目源码
 
@@ -86,22 +86,23 @@ Options List:
 - scrollY: `true` 滚动方向
 - click: `true` 是否启用click事件
 - directionLockThreshold: `5`
-- momentum: `true` 是否开启动量动画，关闭可以提升效率
+- momentum: `true` 是否开启拖动惯性
 - bounce: `true` 是否启用弹力动画效果，关掉可以加速
-- selectedIndex: `0`
-- rotate: `25`
+- selectedIndex: `0` 
+- rotate: `25` 
 - wheel: `false` 是否监听鼠标滚轮事件
-- snap: `false` 自动分割容器，用于制作走马灯效果等
-- snapLoop: `false`
-- snapThreshold: `0.1`
-- swipeTime: `2500`
+- snap: `false` 是否开启捕捉元素，当为 true 时，捕捉的元素会根据可滚动的位置和滚动区域计算得到可滑动几页。
+- snapLoop: `false` 是否创建当前滚动元素子集的拷贝
+- snapThreshold: `0.1` 滑动的长度限制，只有大于这个距离才会触发事件
+- swipeTime: `2500` swipe 持续时间
 - bounceTime: `700` 弹力动画持续的毫秒数
 - adjustTime: `400`
 - swipeBounceTime: `1200`
 - deceleration: `0.001` 滚动动量减速越大越快，建议不大于0.01
-- momentumLimitTime: `300`
-- momentumLimitDistance: `15`
+- momentumLimitTime: `300` 惯性拖动的回弹时间
+- momentumLimitDistance: `15` 惯性拖动的回弹距离
 - resizePolling: `60` 重新调整窗口大小时，重新计算better-scroll的时间间隔
+- probeType: `1` 监听事件的触发时间，1为即时触发，3为延迟到事件完毕后触发
 - preventDefault: `true` 是否阻止默认事件
 - preventDefaultException: `{ tagName: /^(INPUT|TEXTAREA|BUTTON|SELECT)$/ }` 阻止默认事件
 - HWCompositing: `true` 是否启用硬件加速
@@ -126,22 +127,28 @@ scroll.on('scroll', (pos) => {
 
 Events 列表
 
-- beforeScrollStart 滚动开始之前触发
-- scrollStart 滚动开始时触发
-- scroll 滚动时触发
-- scrollCancel 取消滚动时触发
-- scrollEnd 滚动结束时触发
-- flick 
-- refresh
-- destroy 销毁better-scroll实例时触发
+- beforeScrollStart - 滚动开始之前触发
+- scrollStart - 滚动开始时触发
+- scroll - 滚动时触发
+- scrollCancel - 取消滚动时触发
+- scrollEnd - 滚动结束时触发
+- flick - 触发了 fastclick 时的回调函数
+- refresh - 当 better-scroll 刷新时触发
+- destroy - 销毁 better-scroll 实例时触发
 
 
 ## 派发滚动
 
+- scrollTo(x, y, time, easing)
+
+  ​
+
+Example:
+
 ```javascript
 let scroll = new BScroll(document.getElementById('wrapper'))
 scroll.scrollTo(0, 500)
 ...
 ```
 
-第一个参数为X轴，第二个参数为Y轴
+

build/bscroll.js

@@ -58,7 +58,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _bscroll = __webpack_require__(1);
 
-	_bscroll.BScroll.Version = ("0.1.11");
+	_bscroll.BScroll.Version = ("0.1.12");
 
 	module.exports = _bscroll.BScroll;
 
@@ -91,7 +91,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  function BScroll(el, options) {
 	    _classCallCheck(this, BScroll);
 
-	    var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(BScroll).call(this));
+	    var _this = _possibleConstructorReturn(this, (BScroll.__proto__ || Object.getPrototypeOf(BScroll)).call(this));
 
 	    _this.wrapper = typeof el === 'string' ? document.querySelector(el) : el;
 	    _this.scroller = _this.wrapper.children[0];
@@ -718,7 +718,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    value: function _transitionTime() {
 	      var _this4 = this;
 
-	      var time = arguments.length <= 0 || arguments[0] === undefined ? 0 : arguments[0];
+	      var time = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
 
 	      this.scrollerStyle[_util.style.transitionDuration] = time + 'ms';
 
@@ -844,8 +844,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'resetPosition',
 	    value: function resetPosition() {
-	      var time = arguments.length <= 0 || arguments[0] === undefined ? 0 : arguments[0];
-	      var easeing = arguments.length <= 1 || arguments[1] === undefined ? _util.ease.bounce : arguments[1];
+	      var time = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+	      var easeing = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _util.ease.bounce;
 
 	      var x = this.x;
 	      if (!this.hasHorizontalScroll || x > 0) {
@@ -880,8 +880,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'scrollBy',
 	    value: function scrollBy(x, y) {
-	      var time = arguments.length <= 2 || arguments[2] === undefined ? 0 : arguments[2];
-	      var easing = arguments.length <= 3 || arguments[3] === undefined ? _util.ease.bounce : arguments[3];
+	      var time = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+	      var easing = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _util.ease.bounce;
 
 	      x = this.x + x;
 	      y = this.y + y;
@@ -891,7 +891,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'scrollTo',
 	    value: function scrollTo(x, y, time) {
-	      var easing = arguments.length <= 3 || arguments[3] === undefined ? _util.ease.bounce : arguments[3];
+	      var easing = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _util.ease.bounce;
 
 	      this.isInTransition = this.options.useTransition && time > 0 && (x !== this.x || y !== this.y);
 
@@ -985,7 +985,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'goToPage',
 	    value: function goToPage(x, y, time) {
-	      var easing = arguments.length <= 3 || arguments[3] === undefined ? _util.ease.bounce : arguments[3];
+	      var easing = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _util.ease.bounce;
 
 	      if (x >= this.pages.length) {
 	        x = this.pages.length - 1;
@@ -1223,7 +1223,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 	function addEvent(el, type, fn, capture) {
-	  el.addEventListener(type, fn, !!capture);
+	  el.addEventListener(type, fn, { passive: false, capture: !!capture });
 	};
 
 	function removeEvent(el, type, fn, capture) {
@@ -1404,7 +1404,7 @@ return /******/ (function(modules) { // webpackBootstrap
 		_createClass(EventEmitter, [{
 			key: "on",
 			value: function on(type, fn) {
-				var context = arguments.length <= 2 || arguments[2] === undefined ? this : arguments[2];
+				var context = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : this;
 
 				if (!this._events[type]) {
 					this._events[type] = [];
@@ -1415,7 +1415,7 @@ return /******/ (function(modules) { // webpackBootstrap
 		}, {
 			key: "once",
 			value: function once(type, fn) {
-				var context = arguments.length <= 2 || arguments[2] === undefined ? this : arguments[2];
+				var context = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : this;
 
 				var fired = false;
 
@@ -1458,10 +1458,9 @@ return /******/ (function(modules) { // webpackBootstrap
 				for (var i = 0; i < len; i++) {
 					var event = eventsCopy[i];
 
-					var _event = _slicedToArray(event, 2);
-
-					var fn = _event[0];
-					var context = _event[1];
+					var _event = _slicedToArray(event, 2),
+					    fn = _event[0],
+					    context = _event[1];
 
 					if (fn) {
 						fn.apply(context, [].slice.call(arguments, 1));
@@ -1487,10 +1486,10 @@ return /******/ (function(modules) { // webpackBootstrap
 		var distance = current - start;
 		var speed = Math.abs(distance) / time;
 
-		var deceleration = options.deceleration;
-		var itemHeight = options.itemHeight;
-		var swipeBounceTime = options.swipeBounceTime;
-		var bounceTime = options.bounceTime;
+		var deceleration = options.deceleration,
+		    itemHeight = options.itemHeight,
+		    swipeBounceTime = options.swipeBounceTime,
+		    bounceTime = options.bounceTime;
 
 		var duration = options.swipeTime;
 		var rate = options.wheel ? 4 : 15;