Modify config logic

11 years ago · d5181f1db7
2 changed files with 3 additions and 3 deletions
--- a/c3.js
+++ b/c3.js
@ -91,7 +91,7 @@
                // Check next key's value
                isLast = (i === keys.length - 1);
                nextTarget = target[keys[i]];
-                if ((!isLast && typeof nextTarget !== 'object') || (isLast && typeof defaultValue !== 'object' && typeof nextTarget === 'object' && nextTarget !== null)) {
+                if (!isLast && typeof nextTarget !== 'object') {
                    return defaultValue;
                }
                target = nextTarget;
@ -2048,7 +2048,7 @@
            };
        }
        function getBarW(axis, barTargetsNum) {
-            return __bar_width ? __bar_width : barTargetsNum ? (axis.tickOffset() * 2 * __bar_width_ratio) / barTargetsNum : 0;
+            return typeof __bar_width === 'number' ? __bar_width : barTargetsNum ? (axis.tickOffset() * 2 * __bar_width_ratio) / barTargetsNum : 0;
        }
        //-- Type --//
--- a/c3.min.js
+++ b/c3.min.js