From dae1e429b880614fa2512c868c2df7f2af2b74c4 Mon Sep 17 00:00:00 2001 From: wuchangming Date: Thu, 26 Nov 2015 19:35:25 +0800 Subject: [PATCH 1/3] no such file --- gulpfile.js | 1 - 1 file changed, 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 651217eaf..4448e0d5f 100644 --- a/gulpfile.js +++ b/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/**', From 7aa2fd1af37f6a5614d4b30f29bf5ca44c87f432 Mon Sep 17 00:00:00 2001 From: wuchangming Date: Fri, 27 Nov 2015 11:16:54 +0800 Subject: [PATCH 2/3] Bug in handler event.type='touchend' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Chorme. while event.type = "touchend” , event.touches is a empty TouchList, event.touches.length === 0 --- src/core/core.helpers.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/core.helpers.js b/src/core/core.helpers.js index d8c8ac4df..08fc3a419 100644 --- a/src/core/core.helpers.js +++ b/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 From e84d27dde7862713ceb1cdd42139f37775c0bcef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20Mei=C3=9Fner?= Date: Fri, 27 Nov 2015 08:34:32 +0100 Subject: [PATCH 3/3] Fixed wrong structure of example data --- docs/06-Pie-Doughnut-Chart.md | 41 +++++++++++++++++------------------ 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/docs/06-Pie-Doughnut-Chart.md b/docs/06-Pie-Doughnut-Chart.md index 51aaaff22..9511112e2 100644 --- a/docs/06-Pie-Doughnut-Chart.md +++ b/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.