V2.1.6 with tooltip array fix

This commit is contained in:
Evert Timberg 2016-06-14 19:32:24 -04:00
parent 0720608e64
commit 07662b158d
7 changed files with 19 additions and 17 deletions

View File

@ -16,7 +16,7 @@ To install via npm / bower:
npm install chart.js --save npm install chart.js --save
bower install Chart.js --save bower install Chart.js --save
``` ```
CDN: https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.1.5/Chart.min.js CDN: https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.1.6/Chart.min.js
## Documentation ## Documentation

View File

@ -1,6 +1,6 @@
{ {
"name": "Chart.js", "name": "Chart.js",
"version": "2.1.5", "version": "2.1.6",
"description": "Simple HTML5 Charts using the canvas element", "description": "Simple HTML5 Charts using the canvas element",
"homepage": "https://github.com/chartjs/Chart.js", "homepage": "https://github.com/chartjs/Chart.js",
"author": "nnnick", "author": "nnnick",

View File

@ -1,7 +1,7 @@
/*! /*!
* Chart.js * Chart.js
* http://chartjs.org/ * http://chartjs.org/
* Version: 2.1.5 * Version: 2.1.6
* *
* Copyright 2016 Nick Downie * Copyright 2016 Nick Downie
* Released under the MIT license * Released under the MIT license
@ -11675,7 +11675,8 @@ module.exports = function(Chart) {
function pushOrConcat(base, toPush) { function pushOrConcat(base, toPush) {
if (toPush) { if (toPush) {
if (helpers.isArray(toPush)) { if (helpers.isArray(toPush)) {
base = base.concat(toPush); //base = base.concat(toPush);
Array.prototype.push.apply(base, toPush);
} else { } else {
base.push(toPush); base.push(toPush);
} }

File diff suppressed because one or more lines are too long

5
dist/Chart.js vendored
View File

@ -1,7 +1,7 @@
/*! /*!
* Chart.js * Chart.js
* http://chartjs.org/ * http://chartjs.org/
* Version: 2.1.5 * Version: 2.1.6
* *
* Copyright 2016 Nick Downie * Copyright 2016 Nick Downie
* Released under the MIT license * Released under the MIT license
@ -7636,7 +7636,8 @@ module.exports = function(Chart) {
function pushOrConcat(base, toPush) { function pushOrConcat(base, toPush) {
if (toPush) { if (toPush) {
if (helpers.isArray(toPush)) { if (helpers.isArray(toPush)) {
base = base.concat(toPush); //base = base.concat(toPush);
Array.prototype.push.apply(base, toPush);
} else { } else {
base.push(toPush); base.push(toPush);
} }

6
dist/Chart.min.js vendored

File diff suppressed because one or more lines are too long

View File

@ -2,7 +2,7 @@
"name": "chart.js", "name": "chart.js",
"homepage": "http://www.chartjs.org", "homepage": "http://www.chartjs.org",
"description": "Simple HTML5 charts using the canvas element.", "description": "Simple HTML5 charts using the canvas element.",
"version": "2.1.5", "version": "2.1.6",
"license": "MIT", "license": "MIT",
"main": "src/chart.js", "main": "src/chart.js",
"repository": { "repository": {