release notes and version bump

htmlin · Apr 5, 2016 · 75c546d · 75c546d
1 parent 4727730
commit 75c546d
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 37 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,19 +1,5 @@
 # Contributing to iScroll / FAQ
 
-## Why we need a CLA (Contributor License Agreement)
+You are very welcome to collaborate, all changes to the code will be released under an MIT license.
 
-All contributions are welcome but to enforce the openness of this script I have to ask all contributors to sign a Contributor License Agreement. I'm sorry about this but it's the only way to keep the script free and Open Source.
-
-If you are an individual, please sign the following form:
-http://cubiq.org/iscroll/cla/individual.html
-
-If you are a company or an entity please sign the following form:
-http://cubiq.org/iscroll/cla/entity.html
-
-## Why is my patch not accepted yet?
-Thank you very much for your contribution. Please make sure you signed the CLA (see above). Please note that pull requests may take some time to be accepted. Testing iScroll is one of the most time consuming tasks of the project. iScroll works from desktop to smartphone, from tablets to smart TVs. I do not have physical access to all the testing devices, so before I can push a change I have to make sure that the new code is working everywhere.
-
-If you want to speed up the process, please provide your own test results and try to be as more specific as possible.
-
-Thanks!
-Matteo Spinelli
+By submitting a pull request you implicitly agree to give rights of your code to the project authors. Your contribution will always be released under the same MIT license.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -2,6 +2,27 @@
 
 ---
 
+##  Version 5.2.0 - 2016.04.05
+
+### Fixes
+* Fixes weird scrolling in Chrome (#760, #441, #943, #927, #780)
+* [#1009](https://github.com/cubiq/iscroll/issues/1009) fixes utils.prefixPointerEvent method
+* [#1018](https://github.com/cubiq/iscroll/issues/1018), [#652](https://github.com/cubiq/iscroll/issues/652) fixes directionX/Y when scrolling with mouse
+* [#924](https://github.com/cubiq/iscroll/issues/924), [#950](https://github.com/cubiq/iscroll/issues/950) clean up timer on destroy
+* [#949](https://github.com/cubiq/iscroll/issues/949) removes unnecesary style values on wrapper when useTransition option is 'false'
+* [#361](https://github.com/cubiq/iscroll/issues/361) fixes two click/tap events issue
+* [#980](https://github.com/cubiq/iscroll/issues/980) fixes event propagation for wheel event
+* [#768](https://github.com/cubiq/iscroll/issues/768) fixes indicators
+* [#761](https://github.com/cubiq/iscroll/issues/761) fixes two scrollEnd events issue
+* Fixes 'click' event is not fired when iScroll is disabled
+
+### Changes
+* Added AMD support
+* Changed default value of disableMouse/disableTouch/disablePointer options
+* Removed CLA non-sense
+
+---
+
 ##  Version 5.1.3 - 2014.09.19
 
 ### Fixes
@@ -46,4 +67,4 @@
 
 ---
 
-*I started collecting release notes from version 5.1.0*
+*I started collecting release notes from version 5.1.0*
diff --git a/build/iscroll-infinite.js b/build/iscroll-infinite.js
@@ -1,4 +1,4 @@
-/*! iScroll v5.1.3-master ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */
+/*! iScroll v5.2.0 ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */
 (function (window, document, Math) {
 var rAF = window.requestAnimationFrame	||
 	window.webkitRequestAnimationFrame	||
@@ -365,7 +365,7 @@ function IScroll (el, options) {
 }
 
 IScroll.prototype = {
-	version: '5.1.3-master',
+	version: '5.2.0',
 
 	_init: function () {
 		this._initEvents();
@@ -412,7 +412,18 @@ IScroll.prototype = {
 	_start: function (e) {
 		// React to left mouse button only
 		if ( utils.eventType[e.type] != 1 ) {
-			if ( e.button !== 0 ) {
+		  // for button property
+		  // http://unixpapa.com/js/mouse.html
+		  var button;
+	    if (!e.which) {
+	      /* IE case */
+	      button = (e.button < 2) ? 0 :
+	               ((e.button == 4) ? 1 : 2);
+	    } else {
+	      /* All others */
+	      button = e.button;
+	    }
+			if ( button !== 0 ) {
 				return;
 			}
 		}

diff --git a/build/iscroll-lite.js b/build/iscroll-lite.js
@@ -1,4 +1,4 @@
-/*! iScroll v5.1.3-master ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */
+/*! iScroll v5.2.0 ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */
 (function (window, document, Math) {
 var rAF = window.requestAnimationFrame	||
 	window.webkitRequestAnimationFrame	||
@@ -348,7 +348,7 @@ function IScroll (el, options) {
 }
 
 IScroll.prototype = {
-	version: '5.1.3-master',
+	version: '5.2.0',
 
 	_init: function () {
 		this._initEvents();
@@ -379,7 +379,18 @@ IScroll.prototype = {
 	_start: function (e) {
 		// React to left mouse button only
 		if ( utils.eventType[e.type] != 1 ) {
-			if ( e.button !== 0 ) {
+		  // for button property
+		  // http://unixpapa.com/js/mouse.html
+		  var button;
+	    if (!e.which) {
+	      /* IE case */
+	      button = (e.button < 2) ? 0 :
+	               ((e.button == 4) ? 1 : 2);
+	    } else {
+	      /* All others */
+	      button = e.button;
+	    }
+			if ( button !== 0 ) {
 				return;
 			}
 		}

diff --git a/build/iscroll-probe.js b/build/iscroll-probe.js
@@ -1,4 +1,4 @@
-/*! iScroll v5.1.3-master ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */
+/*! iScroll v5.2.0 ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */
 (function (window, document, Math) {
 var rAF = window.requestAnimationFrame	||
 	window.webkitRequestAnimationFrame	||
@@ -363,7 +363,7 @@ function IScroll (el, options) {
 }
 
 IScroll.prototype = {
-	version: '5.1.3-master',
+	version: '5.2.0',
 
 	_init: function () {
 		this._initEvents();
@@ -410,7 +410,18 @@ IScroll.prototype = {
 	_start: function (e) {
 		// React to left mouse button only
 		if ( utils.eventType[e.type] != 1 ) {
-			if ( e.button !== 0 ) {
+		  // for button property
+		  // http://unixpapa.com/js/mouse.html
+		  var button;
+	    if (!e.which) {
+	      /* IE case */
+	      button = (e.button < 2) ? 0 :
+	               ((e.button == 4) ? 1 : 2);
+	    } else {
+	      /* All others */
+	      button = e.button;
+	    }
+			if ( button !== 0 ) {
 				return;
 			}
 		}

diff --git a/build/iscroll-zoom.js b/build/iscroll-zoom.js
@@ -1,4 +1,4 @@
-/*! iScroll v5.1.3-master ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */
+/*! iScroll v5.2.0 ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */
 (function (window, document, Math) {
 var rAF = window.requestAnimationFrame	||
 	window.webkitRequestAnimationFrame	||
@@ -365,7 +365,7 @@ function IScroll (el, options) {
 }
 
 IScroll.prototype = {
-	version: '5.1.3-master',
+	version: '5.2.0',
 
 	_init: function () {
 		this._initEvents();
@@ -416,7 +416,18 @@ IScroll.prototype = {
 	_start: function (e) {
 		// React to left mouse button only
 		if ( utils.eventType[e.type] != 1 ) {
-			if ( e.button !== 0 ) {
+		  // for button property
+		  // http://unixpapa.com/js/mouse.html
+		  var button;
+	    if (!e.which) {
+	      /* IE case */
+	      button = (e.button < 2) ? 0 :
+	               ((e.button == 4) ? 1 : 2);
+	    } else {
+	      /* All others */
+	      button = e.button;
+	    }
+			if ( button !== 0 ) {
 				return;
 			}
 		}

diff --git a/build/iscroll.js b/build/iscroll.js
@@ -1,4 +1,4 @@
-/*! iScroll v5.1.3-master ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */
+/*! iScroll v5.2.0 ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */
 (function (window, document, Math) {
 var rAF = window.requestAnimationFrame	||
 	window.webkitRequestAnimationFrame	||
@@ -360,7 +360,7 @@ function IScroll (el, options) {
 }
 
 IScroll.prototype = {
-	version: '5.1.3-master',
+	version: '5.2.0',
 
 	_init: function () {
 		this._initEvents();
@@ -407,7 +407,18 @@ IScroll.prototype = {
 	_start: function (e) {
 		// React to left mouse button only
 		if ( utils.eventType[e.type] != 1 ) {
-			if ( e.button !== 0 ) {
+		  // for button property
+		  // http://unixpapa.com/js/mouse.html
+		  var button;
+	    if (!e.which) {
+	      /* IE case */
+	      button = (e.button < 2) ? 0 :
+	               ((e.button == 4) ? 1 : 2);
+	    } else {
+	      /* All others */
+	      button = e.button;
+	    }
+			if ( button !== 0 ) {
 				return;
 			}
 		}

diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "iscroll",
   "description": "Smooth scrolling for the web",
-  "version": "5.1.3-master",
-  "homepage": "http://cubiq.org/iscroll-4",
+  "version": "5.2.0",
+  "homepage": "http://iscrolljs.com",
   "author": "Matteo Spinelli <[email protected]> (http://cubiq.org)",
   "keywords": [
     "scrolling",
@@ -15,8 +15,8 @@
   ],
   "main": "build/iscroll.js",
   "devDependencies": {
-    "jshint": "~2.5.1",
-    "uglify-js": "~2.4.13"
+    "jshint": "~2.9.1",
+    "uglify-js": "~2.6.2"
   },
   "repository": {
     "type": "git",
@@ -26,4 +26,4 @@
     "url": "https://github.com/cubiq/iscroll/issues"
   },
   "license": "MIT"
-}
+}