#29 better handling of timeline extremes

joola · Oct 29, 2015 · 089d4a5 · 089d4a5
1 parent 7e4ec33
commit 089d4a5
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 11 deletions.
diff --git a/build/release/joola.js b/build/release/joola.js
@@ -44688,16 +44688,20 @@ var Timeline = module.exports = function (options, callback) {
 
     extremes_0 = self.chart.yAxis[0].getExtremes();
     extremes_0.min = 0;
-    if (extremes_0.dataMin < 0) 
+    if (extremes_0.dataMin < 0)
       extremes_0.min = extremes_0.dataMin;
 
     extremes_0.max = extremes_0.dataMax * 1.1;
     if (extremes_0.dataMin === 0 && extremes_0.dataMax === 0) {
       extremes_0.min = 0;
       extremes_0.max = 1;
     }
-    if (self.last_extremes_0.min !== extremes_0.min || self.last_extremes_0.max !== extremes_0.max)
+    if (self.last_extremes_0)
+      if (self.last_extremes_0.min !== extremes_0.min || self.last_extremes_0.max !== extremes_0.max)
+        self.chart.yAxis[0].setExtremes(extremes_0.min, extremes_0.max, false, false);
+    else
       self.chart.yAxis[0].setExtremes(extremes_0.min, extremes_0.max, false, false);
+
     self.last_extremes_0 = extremes_0;
     if (self.chart.yAxis.length > 1) {
       extremes_1 = self.chart.yAxis[1].getExtremes();

diff --git a/build/release/joola.min.js b/build/release/joola.min.js
diff --git a/build/release/joola.min.js.map b/build/release/joola.min.js.map
diff --git a/build/release/joola.shim.js b/build/release/joola.shim.js
@@ -41090,16 +41090,20 @@ var Timeline = module.exports = function (options, callback) {
 
     extremes_0 = self.chart.yAxis[0].getExtremes();
     extremes_0.min = 0;
-    if (extremes_0.dataMin < 0) 
+    if (extremes_0.dataMin < 0)
       extremes_0.min = extremes_0.dataMin;
 
     extremes_0.max = extremes_0.dataMax * 1.1;
     if (extremes_0.dataMin === 0 && extremes_0.dataMax === 0) {
       extremes_0.min = 0;
       extremes_0.max = 1;
     }
-    if (self.last_extremes_0.min !== extremes_0.min || self.last_extremes_0.max !== extremes_0.max)
+    if (self.last_extremes_0)
+      if (self.last_extremes_0.min !== extremes_0.min || self.last_extremes_0.max !== extremes_0.max)
+        self.chart.yAxis[0].setExtremes(extremes_0.min, extremes_0.max, false, false);
+    else
       self.chart.yAxis[0].setExtremes(extremes_0.min, extremes_0.max, false, false);
+
     self.last_extremes_0 = extremes_0;
     if (self.chart.yAxis.length > 1) {
       extremes_1 = self.chart.yAxis[1].getExtremes();

diff --git a/build/temp/joola.js b/build/temp/joola.js
@@ -41090,16 +41090,20 @@ var Timeline = module.exports = function (options, callback) {
 
     extremes_0 = self.chart.yAxis[0].getExtremes();
     extremes_0.min = 0;
-    if (extremes_0.dataMin < 0) 
+    if (extremes_0.dataMin < 0)
       extremes_0.min = extremes_0.dataMin;
 
     extremes_0.max = extremes_0.dataMax * 1.1;
     if (extremes_0.dataMin === 0 && extremes_0.dataMax === 0) {
       extremes_0.min = 0;
       extremes_0.max = 1;
     }
-    if (self.last_extremes_0.min !== extremes_0.min || self.last_extremes_0.max !== extremes_0.max)
+    if (self.last_extremes_0)
+      if (self.last_extremes_0.min !== extremes_0.min || self.last_extremes_0.max !== extremes_0.max)
+        self.chart.yAxis[0].setExtremes(extremes_0.min, extremes_0.max, false, false);
+    else
       self.chart.yAxis[0].setExtremes(extremes_0.min, extremes_0.max, false, false);
+
     self.last_extremes_0 = extremes_0;
     if (self.chart.yAxis.length > 1) {
       extremes_1 = self.chart.yAxis[1].getExtremes();

diff --git a/src/lib/viz/Timeline.js b/src/lib/viz/Timeline.js
@@ -363,16 +363,20 @@ var Timeline = module.exports = function (options, callback) {
 
     extremes_0 = self.chart.yAxis[0].getExtremes();
     extremes_0.min = 0;
-    if (extremes_0.dataMin < 0) 
+    if (extremes_0.dataMin < 0)
       extremes_0.min = extremes_0.dataMin;
 
     extremes_0.max = extremes_0.dataMax * 1.1;
     if (extremes_0.dataMin === 0 && extremes_0.dataMax === 0) {
       extremes_0.min = 0;
       extremes_0.max = 1;
     }
-    if (self.last_extremes_0.min !== extremes_0.min || self.last_extremes_0.max !== extremes_0.max)
+    if (self.last_extremes_0)
+      if (self.last_extremes_0.min !== extremes_0.min || self.last_extremes_0.max !== extremes_0.max)
+        self.chart.yAxis[0].setExtremes(extremes_0.min, extremes_0.max, false, false);
+    else
       self.chart.yAxis[0].setExtremes(extremes_0.min, extremes_0.max, false, false);
+
     self.last_extremes_0 = extremes_0;
     if (self.chart.yAxis.length > 1) {
       extremes_1 = self.chart.yAxis[1].getExtremes();