Use different min with negative only for stacked chart

586b5607 · Evgeny · e945cadd · 586b5607 · 586b5607 · 586b5607
Commit 586b5607 authored Jul 07, 2016 by Evgeny
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 14 deletions

c3.js c3.js +9 -7

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

axis.js src/axis.js +9 -7

No files found.
--- a/c3.js
+++ b/c3.js
@@ -5008,7 +5008,7 @@
                sizesY = {
                    min: minmax.minY,
                    max: minmax.maxY,
-                    step: (max - min) / 10
+                    step: (minmax.maxY - minmax.minY) / 10
                };
            }

@@ -5018,13 +5018,15 @@
                sizesY.min = Math.max(sizesY.min, -1);
            }

-            if(sizesY.min < 0 && minmax.minY < 0){
-                while(sizesY.min < minmax.minY){
-                    sizesY.min += sizesY.step;
-                }
+            if($$.config.normalized){
+                if(sizesY.min < 0 && minmax.minY < 0){
+                    while(sizesY.min < minmax.minY){
+                        sizesY.min += sizesY.step;
+                    }

-                if(sizesY.min >= minmax.minY){
-                    sizesY.min -= sizesY.step;
+                    if(sizesY.min >= minmax.minY){
+                        sizesY.min -= sizesY.step;
+                    }
                }
            }


--- a/c3.min.js
+++ b/c3.min.js
--- a/src/axis.js
+++ b/src/axis.js
@@ -406,7 +406,7 @@ c3_chart_internal_fn.tuneAxis = function(sync, callback){
            sizesY = {
                min: minmax.minY,
                max: minmax.maxY,
-                step: (max - min) / 10
+                step: (minmax.maxY - minmax.minY) / 10
            };
        }

@@ -416,13 +416,15 @@ c3_chart_internal_fn.tuneAxis = function(sync, callback){
            sizesY.min = Math.max(sizesY.min, -1);
        }

-        if(sizesY.min < 0 && minmax.minY < 0){
-            while(sizesY.min < minmax.minY){
-                sizesY.min += sizesY.step;
-            }
+        if($$.config.normalized){
+            if(sizesY.min < 0 && minmax.minY < 0){
+                while(sizesY.min < minmax.minY){
+                    sizesY.min += sizesY.step;
+                }

-            if(sizesY.min >= minmax.minY){
-                sizesY.min -= sizesY.step;
+                if(sizesY.min >= minmax.minY){
+                    sizesY.min -= sizesY.step;
+                }
            }
        }