Fix a beforeRender bug, which was causing the waterfall connectors an…

…d stacked column totals from being properly rendered. This occurred because the beforeRender is now a formalized accessor, which was previously used outside of the accessors object in those classes.
heavysixer · Nov 27, 2014 · c37ab8e · c37ab8e
1 parent 87f411b
commit c37ab8e
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 52 deletions.
diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
   "name": "d4",
   "description": "A friendly charting DSL for D3",
   "main": "d4.js",
-  "version": "0.8.10",
+  "version": "0.8.16",
   "dependencies": {
     "d3": "~3.4.4"
   },

diff --git a/d4.js b/d4.js
@@ -1,6 +1,6 @@
-/*! d4 - v0.8.15
+/*! d4 - v0.8.16
  *  License: MIT Expat
- *  Date: 2014-10-19
+ *  Date: 2014-11-27
  *  Copyright: Mark Daggett, D4 Team
  */
 /*!
@@ -201,7 +201,7 @@
    *       chart.builder(function() {
    *           return {
    *               link: function(chart, data) {
-   *                   console.log(chart.x.domain.$dirty) // false;
+   *                   // false;
    *               }
    *           }
    *       });
@@ -479,7 +479,7 @@
       var baseFeature = {
         accessors: {
           afterRender: function() {},
-          beforeRender : function(){}
+          beforeRender: function() {}
         },
         proxies: []
       };
@@ -645,7 +645,7 @@
      *      .mixout('yAxis');
      *
      *      // Now test that the feature has been removed.
-     *      console.log(chart.features());
+     *      
      *      // => ["bars", "barLabels", "xAxis"]
      *
      * @return {Array} An array of features.
@@ -724,7 +724,7 @@
      *      .mixout('yAxis');
      *
      *      // Now test that the feature has been removed.
-     *      console.log(chart.features());
+     *      
      *      => ["bars", "barLabels", "xAxis"]
      *
      * @param {String} name - accessor name for chart feature.
@@ -2074,13 +2074,13 @@
 
       return {
         accessors: {
+          beforeRender: function(data) {
+            return calculateStackTotals.bind(this)(data);
+          },
           y: function(d) {
             var padding = 5;
             return this.y(d.size) - padding;
           }
-        },
-        beforeRender: function(data) {
-          return calculateStackTotals.bind(this)(data);
         }
       };
     };
@@ -2218,14 +2218,15 @@
 
       return {
         accessors: {
+          beforeRender: function(data) {
+            return calculateStackTotals.bind(this)(data);
+          },
+
           x: function(d) {
             var padding = 5;
             return this.x(d.size) + padding;
           }
         },
-        beforeRender: function(data) {
-          return calculateStackTotals.bind(this)(data);
-        }
       };
     };
 
@@ -4002,6 +4003,13 @@
   d4.feature('waterfallConnectors', function(name) {
     return {
       accessors: {
+        beforeRender: function(data) {
+          var d = data.map(function(o) {
+            return o.values[0];
+          });
+          return d4.flatten(d);
+        },
+
         classes: function(d, i) {
           return 'series' + i;
         },
@@ -4035,12 +4043,6 @@
           }
         }
       },
-      beforeRender: function(data) {
-        var d = data.map(function(o) {
-          return o.values[0];
-        });
-        return d4.flatten(d);
-      },
 
       render: function(scope, data, selection) {
         selection.append('g').attr('class', name);

diff --git a/d4.min.js b/d4.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d4",
-  "version": "0.8.15",
+  "version": "0.8.16",
   "description": "A friendly reusable chart DSL for D3",
   "repository": {
     "type": "git",

diff --git a/src/base.js b/src/base.js
@@ -474,7 +474,7 @@
       var baseFeature = {
         accessors: {
           afterRender: function() {},
-          beforeRender : function(){}
+          beforeRender: function() {}
         },
         proxies: []
       };

diff --git a/src/charts/stacked-column.js b/src/charts/stacked-column.js
@@ -107,13 +107,13 @@
 
       return {
         accessors: {
+          beforeRender: function(data) {
+            return calculateStackTotals.bind(this)(data);
+          },
           y: function(d) {
             var padding = 5;
             return this.y(d.size) - padding;
           }
-        },
-        beforeRender: function(data) {
-          return calculateStackTotals.bind(this)(data);
         }
       };
     };

diff --git a/src/charts/stacked-row.js b/src/charts/stacked-row.js
@@ -107,14 +107,15 @@
 
       return {
         accessors: {
+          beforeRender: function(data) {
+            return calculateStackTotals.bind(this)(data);
+          },
+
           x: function(d) {
             var padding = 5;
             return this.x(d.size) + padding;
           }
         },
-        beforeRender: function(data) {
-          return calculateStackTotals.bind(this)(data);
-        }
       };
     };
 

diff --git a/src/features/waterfall-connectors.js b/src/features/waterfall-connectors.js
@@ -17,6 +17,13 @@
   d4.feature('waterfallConnectors', function(name) {
     return {
       accessors: {
+        beforeRender: function(data) {
+          var d = data.map(function(o) {
+            return o.values[0];
+          });
+          return d4.flatten(d);
+        },
+
         classes: function(d, i) {
           return 'series' + i;
         },
@@ -50,12 +57,6 @@
           }
         }
       },
-      beforeRender: function(data) {
-        var d = data.map(function(o) {
-          return o.values[0];
-        });
-        return d4.flatten(d);
-      },
 
       render: function(scope, data, selection) {
         selection.append('g').attr('class', name);

diff --git a/test/lib/d4.js b/test/lib/d4.js
@@ -1,6 +1,6 @@
-/*! d4 - v0.8.15
+/*! d4 - v0.8.16
  *  License: MIT Expat
- *  Date: 2014-10-19
+ *  Date: 2014-11-27
  *  Copyright: Mark Daggett, D4 Team
  */
 /*!
@@ -479,7 +479,7 @@
       var baseFeature = {
         accessors: {
           afterRender: function() {},
-          beforeRender : function(){}
+          beforeRender: function() {}
         },
         proxies: []
       };
@@ -2074,13 +2074,13 @@
 
       return {
         accessors: {
+          beforeRender: function(data) {
+            return calculateStackTotals.bind(this)(data);
+          },
           y: function(d) {
             var padding = 5;
             return this.y(d.size) - padding;
           }
-        },
-        beforeRender: function(data) {
-          return calculateStackTotals.bind(this)(data);
         }
       };
     };
@@ -2218,14 +2218,15 @@
 
       return {
         accessors: {
+          beforeRender: function(data) {
+            return calculateStackTotals.bind(this)(data);
+          },
+
           x: function(d) {
             var padding = 5;
             return this.x(d.size) + padding;
           }
         },
-        beforeRender: function(data) {
-          return calculateStackTotals.bind(this)(data);
-        }
       };
     };
 
@@ -4002,6 +4003,13 @@
   d4.feature('waterfallConnectors', function(name) {
     return {
       accessors: {
+        beforeRender: function(data) {
+          var d = data.map(function(o) {
+            return o.values[0];
+          });
+          return d4.flatten(d);
+        },
+
         classes: function(d, i) {
           return 'series' + i;
         },
@@ -4035,12 +4043,6 @@
           }
         }
       },
-      beforeRender: function(data) {
-        var d = data.map(function(o) {
-          return o.values[0];
-        });
-        return d4.flatten(d);
-      },
 
       render: function(scope, data, selection) {
         selection.append('g').attr('class', name);