#29 better handling of timeline extremes

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

Hide file tree

Showing 9 changed files with 74 additions and 58 deletions.
diff --git a/build/release/joola.js b/build/release/joola.js
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
diff --git a/build/temp/joola.js b/build/temp/joola.js
diff --git a/build/temp/meta.json b/build/temp/meta.json
diff --git a/src/lib/viz/DimensionPicker.js b/src/lib/viz/DimensionPicker.js
@@ -91,7 +91,9 @@ var DimensionPicker = module.exports = function (options, callback) {
           });
 
           list = _.sortBy(list, function (item) {
-            return item.ordinal || item.name || item.key;
+            if (item.ordinal)
+              return parseInt(item.ordinal, 10);
+            return item.name || item.key;
           });
 
           list.forEach(function (dimension) {

diff --git a/src/lib/viz/MetricPicker.js b/src/lib/viz/MetricPicker.js
@@ -80,7 +80,9 @@ var MetricPicker = module.exports = function (options, callback) {
           var mlasttarget = null;
 
           list = _.sortBy(list, function (item) {
-            return item.ordinal || item.name || item.key;
+            if (item.ordinal)
+              return parseInt(item.ordinal, 10);
+            return item.name || item.key;
           });
 
           list.forEach(function (metric) {

diff --git a/src/lib/viz/Timeline.js b/src/lib/viz/Timeline.js
@@ -361,19 +361,19 @@ var Timeline = module.exports = function (options, callback) {
       self.chart.addSeries(s);
     });
 
-    self.chart.redraw();
     extremes_0 = self.chart.yAxis[0].getExtremes();
     extremes_0.min = 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)
-      self.last_extremes_0 = 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);
+      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();
       extremes_1.min = 0;
@@ -385,9 +385,9 @@ var Timeline = module.exports = function (options, callback) {
       if (!self.last_extremes_1)
         self.last_extremes_1 = extremes_1;
       if (self.last_extremes_1.min !== extremes_1.min || self.last_extremes_1.max !== extremes_1.max)
-        self.chart.yAxis[1].setExtremes(extremes_1.min, extremes_1.max);
+        self.chart.yAxis[1].setExtremes(extremes_1.min, extremes_1.max, false, false);
     }
-    //}
+    self.chart.redraw();
   };
 
   this.clearAllFiltered = function (skipdraw, callback) {