Fix conflict

fd2cbf8d · Masayuki Tanaka · 805b15a3 · 42b28495 · fd2cbf8d · fd2cbf8d
Commit fd2cbf8d authored Sep 03, 2014 by Masayuki Tanaka
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

c3.js c3.js +6 -0

c3.min.js c3.min.js +0 -0

domain.js src/domain.js +6 -0

No files found.
--- a/c3.js
+++ b/c3.js
@@ -1239,6 +1239,12 @@
        if (yTargets.length === 0) { // use current domain if target of axisId is none
            return axisId === 'y2' ? $$.y2.domain() : $$.y.domain();
        }
+        if (isNaN(yDomainMin)) { // set minimum to zero when not number
+            yDomainMin = 0;
+        }
+        if (isNaN(yDomainMax)) { // set maximum to have same value as yDomainMin
+            yDomainMax = yDomainMin;
+        }
        if (yDomainMin === yDomainMax) {
            yDomainMin < 0 ? yDomainMax = 0 : yDomainMin = 0;
        }

--- a/c3.min.js
+++ b/c3.min.js
--- a/src/domain.js
+++ b/src/domain.js
@@ -76,6 +76,12 @@ c3_chart_internal_fn.getYDomain = function (targets, axisId) {
    if (yTargets.length === 0) { // use current domain if target of axisId is none
        return axisId === 'y2' ? $$.y2.domain() : $$.y.domain();
    }
+    if (isNaN(yDomainMin)) { // set minimum to zero when not number
+        yDomainMin = 0;
+    }
+    if (isNaN(yDomainMax)) { // set maximum to have same value as yDomainMin
+        yDomainMax = yDomainMin;
+    }
    if (yDomainMin === yDomainMax) {
        yDomainMin < 0 ? yDomainMax = 0 : yDomainMin = 0;
    }