← All changes | js/render-chartjs.js +1 -30 3.10.4 → 3.9.2 View file →

		@@ -117,37 +117,8 @@
117	117	if ( getChart ) {
118	118	return;
119	119	}
120	120
121		- // Format series label.
122		- settings.plugins.tooltip = {
123		- callbacks: {
124		- label: function(context) {
125		- var label = '';
126		- if ( 'object' === typeof context.dataset.label ) {
127		- label = context.label || '';
128		- } else {
129		- label = context.dataset.label || '';
130		- }
131		- if ( label ) {
132		- label += ': ';
133		- }
134		- var format = context.dataset.format || '';
135		- if ( format ) {
136		- label += format_datum( context.formattedValue, format );
137		- } else {
138		- format = 'undefined' !== typeof context.chart.config._config.options.format ? context.chart.config._config.options.format : '';
139		- if ( format ) {
140		- label += format_datum( context.formattedValue, format );
141		- } else {
142		- label += context.formattedValue;
143		- }
144		- }
145		- return label;
146		- }
147		- }
148		- };
149		-
150	121	var chartjs = new Chart(context, {
151	122	type: type,
152	123	data: {
153	124	labels: labels,
		@@ -159,9 +130,9 @@
159	130	var canvas = $( 'canvas' )[0];
160	131	if ( $( '#chart-img' ).length ) {
161	132	$( '#chart-img' ).val( canvas.toDataURL() );
162	133	}
163		- }
	134	+ },
164	135	}],
165	136	});
166	137
167	138	// this line needs to be included twice. This is not an error.