Merge branch 'v2.0-dev' of https://github.com/nnnick/Chart.js into v2.0-dev

docs/06-Pie-Doughnut-Chart.md

@@ -42,27 +42,26 @@ var myDoughnutChart = new Chart(ctx[1], {
 
 ```javascript
 var data = {
-	datasets: [
-		{
-			data: [300, 50, 100],
-			backgroundColors: [
-				"#F7464A",
-				"#46BFBD",
-				"#FDB45C"
-			],
-			hoverBackgroundColor:[
-				 "#FF5A5E",
-				  "#5AD3D1",
-					"#FFC870"
-			]
-		},
-		labels: [
-			"Red",
-			"Green",
-			"Yellow"
-		]
-	]
-}
+    labels: [
+        "Red",
+        "Green",
+        "Yellow"
+    ],
+    datasets: [
+        {
+            data: [300, 50, 100],
+            backgroundColor: [
+                "#F7464A",
+                "#46BFBD",
+                "#FDB45C"
+            ],
+            hoverBackgroundColor: [
+                "#FF5A5E",
+                "#5AD3D1",
+                "#FFC870"
+            ]
+        }]
+};
 ```
 
 For a pie chart, you must pass in an array of objects with a value and an optional color property. The value attribute should be a number, Chart.js will total all of the numbers and calculate the relative proportion of each. The color attribute should be a string. Similar to CSS, for this string you can use HEX notation, RGB, RGBA or HSL.

gulpfile.js

@@ -27,7 +27,6 @@ var srcFiles = [
 	'./node_modules/color/dist/color.min.js',
 	'./src/core/core.js',
 	'./src/core/core.helpers.js',
-	'./src/core/core.chart.js',
 	'./src/core/core.element.js',
 	'./src/core/**',
 	'./src/controllers/**',

src/core/core.helpers.js

@@ -333,7 +333,7 @@
 
 			var d01 = Math.sqrt(Math.pow(current.x - previous.x, 2) + Math.pow(current.y - previous.y, 2));
 			var d12 = Math.sqrt(Math.pow(next.x - current.x, 2) + Math.pow(next.y - current.y, 2));
-			
+
 			var s01 = d01 / (d01 + d12);
 			var s12 = d12 / (d01 + d12);
 
@@ -624,7 +624,7 @@
 				canvas = evt.currentTarget || evt.srcElement,
 				boundingRect = canvas.getBoundingClientRect();
 
-			if (e.touches) {
+			if (e.touches && e.touches.length > 0) {
 				mouseX = e.touches[0].clientX;
 				mouseY = e.touches[0].clientY;
 
@@ -634,7 +634,7 @@
 			}
 
 			// Scale mouse coordinates into canvas coordinates
-			// by following the pattern laid out by 'jerryj' in the comments of 
+			// by following the pattern laid out by 'jerryj' in the comments of
 			// http://www.html5canvastutorials.com/advanced/html5-canvas-mouse-coordinates/
 
 			// We divide by the current device pixel ratio, because the canvas is scaled up by that amount in each direction. However