File tree Expand file tree Collapse file tree 1 file changed +10
-6
lines changed Expand file tree Collapse file tree 1 file changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -15,12 +15,16 @@ var mergeArray = require('../../lib').mergeArray;
1515// arrayOk attributes, merge them into calcdata array
1616module . exports = function arraysToCalcdata ( cd ) {
1717 var trace = cd [ 0 ] . trace ,
18- marker = trace . marker ,
19- markerLine = marker . line ;
18+ marker = trace . marker ;
2019
2120 mergeArray ( trace . text , cd , 'tx' ) ;
22- mergeArray ( marker . opacity , cd , 'mo' ) ;
23- mergeArray ( marker . color , cd , 'mc' ) ;
24- mergeArray ( markerLine . color , cd , 'mlc' ) ;
25- mergeArray ( markerLine . width , cd , 'mlw' ) ;
21+
22+ if ( marker && marker . line ) {
23+ var markerLine = marker . line ;
24+
25+ mergeArray ( marker . opacity , cd , 'mo' ) ;
26+ mergeArray ( marker . color , cd , 'mc' ) ;
27+ mergeArray ( markerLine . color , cd , 'mlc' ) ;
28+ mergeArray ( markerLine . width , cd , 'mlw' ) ;
29+ }
2630} ;
You can’t perform that action at this time.
0 commit comments