Merge remote-tracking branch 'novus/master'

nv.d3.js

@@ -3189,7 +3189,7 @@ nv.models.linePlusBarChart = function() {
     var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ),
         top = e.pos[1] + ( offsetElement.offsetTop || 0),
         x = xAxis.tickFormat()(lines.x()(e.point, e.pointIndex)),
-        y = yAxis1.tickFormat()(lines.y()(e.point)),
+        y = yAxis1.tickFormat()(lines.y()(e.point, e.pointIndex)),
         content = tooltip(e.series.key, x, y, e, chart);
 
     nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's');
@@ -4202,11 +4202,6 @@ nv.models.multiBarChart = function() {
     nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's');
   };
 
-  //TODO: let user select default
-  var controlsData = [
-    { key: 'Grouped', disabled: multibar.stacked },
-    { key: 'Stacked', disabled: !multibar.stacked }
-  ];
 
   function chart(selection) {
     selection.each(function(data) {
@@ -4218,7 +4213,6 @@ nv.models.multiBarChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-
       x = multibar.xScale();
       y = multibar.yScale();
 
@@ -4265,6 +4259,11 @@ nv.models.multiBarChart = function() {
 
 
       if (showControls) {
+        var controlsData = [
+          { key: 'Grouped', disabled: multibar.stacked() },
+          { key: 'Stacked', disabled: !multibar.stacked() }
+        ];
+
         controls.width(180).color(['#444', '#444', '#444']);
         g.select('.controlsWrap')
             .datum(controlsData)

src/models/linePlusBarChart.js

@@ -29,7 +29,7 @@ nv.models.linePlusBarChart = function() {
     var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ),
         top = e.pos[1] + ( offsetElement.offsetTop || 0),
         x = xAxis.tickFormat()(lines.x()(e.point, e.pointIndex)),
-        y = yAxis1.tickFormat()(lines.y()(e.point)),
+        y = yAxis1.tickFormat()(lines.y()(e.point, e.pointIndex)),
         content = tooltip(e.series.key, x, y, e, chart);
 
     nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's');

src/models/multiBarChart.js

@@ -43,11 +43,6 @@ nv.models.multiBarChart = function() {
     nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's');
   };
 
-  //TODO: let user select default
-  var controlsData = [
-    { key: 'Grouped', disabled: multibar.stacked },
-    { key: 'Stacked', disabled: !multibar.stacked }
-  ];
 
   function chart(selection) {
     selection.each(function(data) {
@@ -59,7 +54,6 @@ nv.models.multiBarChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-
       x = multibar.xScale();
       y = multibar.yScale();
 
@@ -106,6 +100,11 @@ nv.models.multiBarChart = function() {
 
 
       if (showControls) {
+        var controlsData = [
+          { key: 'Grouped', disabled: multibar.stacked() },
+          { key: 'Stacked', disabled: !multibar.stacked() }
+        ];
+
         controls.width(180).color(['#444', '#444', '#444']);
         g.select('.controlsWrap')
             .datum(controlsData)