Merge pull request plotly#926 from mathiasrw/patch-1

etpinard · web-flow · commit 937e6bac131c · 2016-09-12T15:38:33.000-04:00
Correct check for undefined variable
diff --git a/src/traces/scatter/calc.js b/src/traces/scatter/calc.js
@@ -122,7 +122,7 @@ module.exports = function calc(gd, trace) {
     }
 
     // this has migrated up from arraysToCalcdata as we have a reference to 's' here
-    if(typeof s !== undefined) Lib.mergeArray(s, cd, 'ms');
+    if(typeof s !== 'undefined') Lib.mergeArray(s, cd, 'ms');
 
     gd.firstscatter = false;
     return cd;
diff --git a/src/traces/scatterternary/calc.js b/src/traces/scatterternary/calc.js
@@ -91,7 +91,7 @@ module.exports = function calc(gd, trace) {
     calcColorscale(trace);
 
     // this has migrated up from arraysToCalcdata as we have a reference to 's' here
-    if(typeof s !== undefined) Lib.mergeArray(s, cd, 'ms');
+    if(typeof s !== 'undefined') Lib.mergeArray(s, cd, 'ms');
 
     return cd;
 };

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ module.exports = function calc(gd, trace) {`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`// this has migrated up from arraysToCalcdata as we have a reference to 's' here`
`125`		`- if(typeof s !== undefined) Lib.mergeArray(s, cd, 'ms');`
	`125`	`+ if(typeof s !== 'undefined') Lib.mergeArray(s, cd, 'ms');`
`126`	`126`
`127`	`127`	`gd.firstscatter = false;`
`128`	`128`	`return cd;`