← All changes | js/render-chartjs.js +2 -3 3.10.13 → 3.10.2 View file →

		@@ -132,10 +132,9 @@
132	132	label += ': ';
133	133	}
134	134	var format = context.dataset.format || '';
135	135	if ( format ) {
136		- var lastSuffix = numeral(context.formattedValue).format(format).replace(/[0-9]/g, '');
137		- label += context.formattedValue + lastSuffix;
	136	+ label += format_datum( context.formattedValue, format );
138	137	} else {
139	138	format = 'undefined' !== typeof context.chart.config._config.options.format ? context.chart.config._config.options.format : '';
140	139	if ( format ) {
141	140	label += format_datum( context.formattedValue, format );
		@@ -467,9 +466,9 @@
467	466
468	467	switch(type) {
469	468	case 'number':
470	469	// numeral.js works on 0 instead of # so we just replace that in the ICU pattern set.
471		- format = format.replace(/#/g, '0').replace(/%/g, '');
	470	+ format = format.replace(/#/g, '0');
472	471	// we also replace all instance of '$' as that is more relevant for ticks.
473	472	if(removeDollar){
474	473	format = format.replace(/\$/g, '');
475	474	}