From d60b09a646e0eeb3c8ac0df64ca72fc350140975 Mon Sep 17 00:00:00 2001 From: Robert Monfera Date: Wed, 5 Oct 2016 21:55:19 +0200 Subject: [PATCH 1/2] Change Lib.coerce2 so it doesn't return false for falsey things (0, "", null, NaN) except if it's false or undefined --- src/lib/coerce.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/coerce.js b/src/lib/coerce.js index b974f323016..51c810b34b4 100644 --- a/src/lib/coerce.js +++ b/src/lib/coerce.js @@ -322,7 +322,7 @@ exports.coerce2 = function(containerIn, containerOut, attributes, attribute, dfl var propIn = nestedProperty(containerIn, attribute), propOut = exports.coerce(containerIn, containerOut, attributes, attribute, dflt); - return propIn.get() ? propOut : false; + return propIn.get() !== undefined ? propOut : false; }; /* From 6396301f344652925f85e5883dd4a91eeb41803f Mon Sep 17 00:00:00 2001 From: Robert Monfera Date: Wed, 5 Oct 2016 22:04:47 +0200 Subject: [PATCH 2/2] Perform logic such that a specified zero value doesn't mean false in the condition --- src/traces/contour/defaults.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/traces/contour/defaults.js b/src/traces/contour/defaults.js index e88b43cbe7f..e9253b42066 100644 --- a/src/traces/contour/defaults.js +++ b/src/traces/contour/defaults.js @@ -33,7 +33,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout var contourStart = Lib.coerce2(traceIn, traceOut, attributes, 'contours.start'), contourEnd = Lib.coerce2(traceIn, traceOut, attributes, 'contours.end'), - autocontour = coerce('autocontour', !(contourStart && contourEnd)); + autocontour = coerce('autocontour', contourStart === false || contourEnd === false); if(autocontour) coerce('ncontours'); else coerce('contours.size');