Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-18 22:26:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Stable Bar Chart, DRY core functions

Browse Source
This commit is contained in:
Tanner Linsley
2015-05-15 00:04:42 -06:00
parent b432a3d6db
commit f79ebdaa88
2 changed files with 83 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/Chart.Core.js
View File

@@ -945,15 +945,12 @@
}
return this;
},
reflow : noop,
render : function(reflow, customDuration){
if (reflow){
this.reflow();
}
redraw : noop,
render : function(duration){
if (this.options.animation && !reflow){
if (this.options.animation){
var animation = new Chart.Animation();
animation.numSteps = (customDuration || this.options.animationDuration) / 16.66; //60 fps
animation.numSteps = (duration || this.options.animationDuration) / 16.66; //60 fps
animation.easing = this.options.animationEasing;
// render function
@@ -969,7 +966,7 @@
animation.onAnimationProgress = this.options.onAnimationProgress;
animation.onAnimationComplete = this.options.onAnimationComplete;
Chart.animationService.addAnimation(this, animation, customDuration);
Chart.animationService.addAnimation(this, animation, duration);
}
else{
this.draw();
@@ -977,6 +974,51 @@
}
return this;
},
eachElement : function(callback){
helpers.each(this.data.datasets,function(dataset, datasetIndex){
helpers.each(dataset.metaData, callback, this, datasetIndex);
},this);
},
eachValue : function(callback){
helpers.each(this.data.datasets,function(dataset, datasetIndex){
helpers.each(dataset.data, callback, this, datasetIndex);
},this);
},
getElementsAtEvent : function(e){
var elementsArray = [],
eventPosition = helpers.getRelativePosition(e),
datasetIterator = function(dataset){
elementsArray.push(dataset.metaData[elementIndex]);
},
elementIndex;
for (var datasetIndex = 0; datasetIndex < this.data.datasets.length; datasetIndex++) {
for (elementIndex = 0; elementIndex < this.data.datasets[datasetIndex].metaData.length; elementIndex++) {
if (this.data.datasets[datasetIndex].metaData[elementIndex].inRange(eventPosition.x,eventPosition.y)){
helpers.each(this.data.datasets, datasetIterator);
}
}
}
return elementsArray.length ? elementsArray : [];
},
// Get the single element that was clicked on
// @return : An object containing the dataset index and element index of the matching element. Also contains the rectangle that was drawn
getElementAtEvent : function(e) {
var element = [];
var eventPosition = helpers.getRelativePosition(e);
for (var datasetIndex = 0; datasetIndex < this.data.datasets.length; ++datasetIndex) {
for (var elementIndex = 0; elementIndex < this.data.datasets[datasetIndex].metaData.length; ++elementIndex) {
if (this.data.datasets[datasetIndex].metaData[elementIndex].inRange(eventPosition.x, eventPosition.y)) {
element.push(this.data.datasets[datasetIndex].metaData[elementIndex]);
return element;
}
}
}
return [];
},
generateLegend : function(){
return template(this.options.legendTemplate,this);
},
@@ -1337,10 +1379,10 @@
switch(this._options.hoverMode){
case 'single':
helpers.extend(this, {
text: template(this._options.tooltipTemplate, this._active),
text: template(this._options.tooltipTemplate, this._active[0]),
});
var tooltipPosition = this._active[0].tooltipPosition();
helpers.extend(this.tooltip, {
helpers.extend(this, {
x: Math.round(tooltipPosition.x),
y: Math.round(tooltipPosition.y),
});
@@ -2116,9 +2158,9 @@
frameDuration: 17,
animations: [],
dropFrames: 0,
addAnimation: function(chartInstance, animationObject, customDuration) {
addAnimation: function(chartInstance, animationObject, duration) {
if(!customDuration){
if(!duration){
chartInstance.animating = true;
}