Merge branch 'fix-dereferencing' of https://github.com/Marsup/nvd3 into master-263

src/models/discreteBar.js

@@ -45,12 +45,10 @@ nv.models.discreteBar = function() {
 
 
       //add series index to each data point for reference
-      data = data.map(function(series, i) {
-        series.values = series.values.map(function(point) {
+      data.forEach(function(series, i) {
+        series.values.forEach(function(point) {
           point.series = i;
-          return point;
         });
-        return series;
       });
 
 

src/models/multiBar.js

@@ -68,12 +68,10 @@ nv.models.multiBar = function() {
 
 
       //add series index to each data point for reference
-      data = data.map(function(series, i) {
-        series.values = series.values.map(function(point) {
+      data.forEach(function(series, i) {
+        series.values.forEach(function(point) {
           point.series = i;
-          return point;
         });
-        return series;
       });
 
 

src/models/multiBarHorizontal.js

@@ -58,12 +58,10 @@ nv.models.multiBarHorizontal = function() {
 
 
       //add series index to each data point for reference
-      data = data.map(function(series, i) {
-        series.values = series.values.map(function(point) {
+      data.forEach(function(series, i) {
+        series.values.forEach(function(point) {
           point.series = i;
-          return point;
         });
-        return series;
       });
 
 

src/models/multiBarTimeSeries.js

@@ -52,12 +52,10 @@ nv.models.multiBarTimeSeries = function() {
 
 
       //add series index to each data point for reference
-      data = data.map(function(series, i) {
-        series.values = series.values.map(function(point) {
+      data.forEach(function(series, i) {
+        series.values.forEach(function(point) {
           point.series = i;
-          return point;
         });
-        return series;
       });
 
       //------------------------------------------------------------

src/models/stackedArea.js

@@ -59,14 +59,12 @@ nv.models.stackedArea = function() {
 
       var dataRaw = data;
       // Injecting point index into each point because d3.layout.stack().out does not give index
-      data = data.map(function(aseries, i) {
+      data.forEach(function(aseries, i) {
         aseries.seriesIndex = i;
-               aseries.values = aseries.values.map(function(d, j) {
+        aseries.values = aseries.values.forEach(function(d, j) {
           d.index = j;
           d.seriesIndex = i;
-                 return d;
-               })
-               return aseries;
+        });
       });
 
       var dataFiltered = data.filter(function(series) {

src/models/stackedAreaChart.js

@@ -304,14 +304,12 @@ nv.models.stackedAreaChart = function() {
 
       stacked.dispatch.on('areaClick.toggle', function(e) {
         if (data.filter(function(d) { return !d.disabled }).length === 1)
-          data = data.map(function(d) {
+          data.forEach(function(d) {
             d.disabled = false;
-            return d
           });
         else
-          data = data.map(function(d,i) {
+          data.forEach(function(d,i) {
             d.disabled = (i != e.seriesIndex);
-            return d
           });
 
         state.disabled = data.map(function(d) { return !!d.disabled });