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

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