Skip to content

Commit eb934cd

Browse files
committed
Merge pull request highchartTable#37 from MatCottet/spiderweb
Some more options to use spiderweb graph and polar chart
2 parents d1d85af + 59c29f5 commit eb934cd

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

jquery.highchartTable.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
var vlinex = $th.data('graph-vline-x');
129129
if (typeof vlinex == 'undefined') {
130130
thGraphConfig.scale = typeof columnScale != 'undefined' ? parseFloat(columnScale) : 1;
131-
thGraphConfig.graphType = serieGraphType == 'column' && isGraphInverted ? 'bar' : serieGraphType;;
131+
thGraphConfig.graphType = serieGraphType == 'column' && isGraphInverted ? 'bar' : serieGraphType;
132132
thGraphConfig.stack = serieStackGroup;
133133
thGraphConfig.unit = $th.data('graph-unit');
134134
columns[indexTh] = thGraphConfig;
@@ -284,7 +284,8 @@
284284
endOnTick: $table.data('graph-yaxis-'+yAxisNum+'-end-on-tick') !== "0",
285285
stackLabels : {
286286
enabled: $table.data('graph-yaxis-'+yAxisNum+'-stacklabels-enabled') == '1'
287-
}
287+
},
288+
gridLineInterpolation: $table.data('graph-yaxis-'+yAxisNum+'-grid-line-interpolation') || null
288289
};
289290

290291
var callableYAxisFormatter = getCallable(table, 'graph-yaxis-'+yAxisNum+'-formatter-callback');
@@ -345,7 +346,8 @@
345346
marginLeft: typeof marginLeft != 'undefined' ? marginLeft : null,
346347
spacingTop: $table.data('graph-spacing-top') || 10,
347348
height: $table.data('graph-height') || null,
348-
zoomType: $table.data('graph-zoom-type') || null
349+
zoomType: $table.data('graph-zoom-type') || null,
350+
polar: $table.data('graph-polar') || null
349351
},
350352
title: {
351353
text: graphTitle
@@ -365,7 +367,7 @@
365367
type: ($table.data('graph-xaxis-type') == 'datetime') ? 'datetime' : undefined,
366368
reversed: $table.data('graph-xaxis-reversed') == '1',
367369
opposite: $table.data('graph-xaxis-opposite') == '1',
368-
showLastLabel: true,
370+
showLastLabel: typeof $table.data('graph-xaxis-show-last-label') != 'undefined' ? $table.data('graph-xaxis-show-last-label') : true,
369371
tickInterval: $table.data('graph-xaxis-tick-interval') || null,
370372
dateTimeLabelFormats: { //by default, we display the day and month on the datetime graphs
371373
second: '%e. %b',
@@ -392,7 +394,9 @@
392394
text: $table.data('graph-xaxis-title-text') || null
393395
},
394396
gridLineWidth: $table.data('graph-xaxis-gridLine-width') || 0,
395-
gridLineDashStyle: $table.data('graph-xaxis-gridLine-style') || 'ShortDot'
397+
gridLineDashStyle: $table.data('graph-xaxis-gridLine-style') || 'ShortDot',
398+
tickmarkPlacement: $table.data('graph-xaxis-tickmark-placement') || 'between',
399+
lineWidth: $table.data('graph-xaxis-line-width') || 0
396400
},
397401
yAxis: yAxisConfig,
398402
tooltip: {

0 commit comments

Comments
 (0)