← All changes | js/render-datatables.js +5 -28 4.0.4 → 3.4.2 View file →

		@@ -23,13 +23,8 @@
23	23
24	24	if(chart.library !== 'datatables'){
25	25	return;
26	26	}
27		-
28		- // Bail if the chart is already rendered or is being rendered.
29		- if ( ! window.isResizeRequest && ( $('#' + id).hasClass('visualizer-chart-loaded') || ( 'canvas' !== id && $('#' + id).children( ':not(.loader, style)' ).length > 0 ) ) ) {
30		- return;
31		- }
32	27	rendered_charts[id] = 'yes';
33	28
34	29	series = chart.series;
35	30	data = chart.data;
		@@ -72,9 +67,9 @@
72	67	delete chart.settings['scrollX'];
73	68	delete chart.settings['scrollY'];
74	69	delete chart.settings['scrollY_int'];
75	70	$.extend( settings, {
76		- scrollX: '100%',
	71	+ scrollX: 150,
77	72	scrollY: (( chart.settings['responsive_bool'] === 'true' ? 0.8 : 0.5 ) * parseInt($(container).css('height').replace('px',''))),
78	73	scrollCollapse: true
79	74	} );
80	75	}else{
		@@ -82,9 +77,9 @@
82	77	chart.settings['scrollY_int'];
83	78	}
84	79	delete chart.settings['scrollX'];
85	80	$.extend( settings, {
86		- scrollX: '100%',
	81	+ scrollX: 150,
87	82	scrollY: 180,
88	83	} );
89	84	}
90	85	break;
		@@ -189,8 +184,9 @@
189	184	case 'timeofday':
190	185	type = 'date';
191	186	break;
192	187	}
	188	+
193	189	render = addRenderer(series[j].type, settings.series, j);
194	190
195	191	var col = { title: series[j].label, data: series[j].label, type: type, render: render };
196	192	if(typeof chart.settings['cssClassNames'] !== 'undefined' && typeof chart.settings['cssClassNames']['tableCell'] !== 'undefined'){
		@@ -251,13 +247,10 @@
251	247	parts[0] = series.format.thousands;
252	248	}
253	249	if(typeof series.format.decimal !== ''){
254	250	parts[1] = series.format.decimal;
255		- if ( '' === series.format.precision ) {
256		- series.format.precision = 2;
257		- }
258	251	}
259		- if(typeof series.format.precision !== '' && parseInt(series.format.precision) > 0){
	252	+ if(typeof series.format.precision !== ''){
260	253	parts[2] = series.format.precision;
261	254	}
262	255	if(typeof series.format.prefix !== ''){
263	256	parts[3] = series.format.prefix;
		@@ -273,21 +266,10 @@
273	266	if(typeof series.format.to !== 'undefined' && typeof series.format.from !== 'undefined' && series.format.from != '' && series.format.to !== ''){
274	267	render = $.fn.dataTable.render.moment(series.format.from, series.format.to);
275	268	}
276	269	break;
277		- default:
278		- render = $.fn.dataTable.render.extra = function ( data, type, row ) {
279		- if((data === true || data === 'true') && typeof series.format !== 'undefined' && series.format.truthy !== ''){
280		- data = series.format.truthy.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '');
281		- }
282		- if((data === false || data === 'false') && typeof series.format !== 'undefined' && series.format.falsy !== ''){
283		- data = series.format.falsy.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '');
284		- }
285		- return data;
286		- }
287	270	}
288	271	/* jshint ignore:end */
289		-
290	272	return render;
291	273	}
292	274
293	275	function render(v) {
		@@ -297,14 +279,9 @@
297	279	}
298	280
299	281	$('body').on('visualizer:render:chart:start', function(event, v){
300	282	all_charts = v.charts;
301		-
302		- if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line
303		- renderChart(v.id, v);
304		- } else {
305		- render(v);
306		- }
	283	+ render(v);
307	284	});
308	285
309	286	$('body').on('visualizer:render:specificchart:start', function(event, v){
310	287	renderSpecificChart(v.id, v.chart, v.v);