transitions enabled after plot is initialized

mwasiluk · Aug 30, 2016 · abc8781 · abc8781
1 parent 01c15a0
commit abc8781
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 23 deletions.
diff --git a/dist/odc-d3.js b/dist/odc-d3.js
diff --git a/dist/odc-d3.min.js b/dist/odc-d3.min.js
diff --git a/dist/odc-d3.min.js.map b/dist/odc-d3.min.js.map
diff --git a/src/chart.js b/src/chart.js
@@ -161,7 +161,6 @@ export class Chart {
 
             this._attached[attachmentName].update(attachmentData);
         }
-        console.log('base uppdate');
         return this;
     }
 
@@ -355,4 +354,8 @@ export class Chart {
         this.plot.width = Utils.availableWidth(this.config.width, this.getBaseContainer(), this.plot.margin);
         this.plot.height = Utils.availableHeight(this.config.height, this.getBaseContainer(), this.plot.margin);
     }
+
+    transitionEnabled(){
+        return this._isInitialized && this.config.transition;
+    }
 }
diff --git a/src/histogram.js b/src/histogram.js
@@ -190,14 +190,18 @@ export class Histogram extends Chart{
             .append("rect")
             .attr("x", 1);
 
-        bar.attr("transform", function(d) { return "translate(" + plot.x.scale(d.x) + "," + (plot.y.scale(d.y)) + ")"; });
+
         var barRect = bar.select("rect");
 
         var barRectT = barRect;
-        if (self.config.transition) {
+        var barT = bar;
+        if (this.transitionEnabled()) {
             barRectT = barRect.transition();
+            barT = bar.transition();
         }
 
+        barT.attr("transform", function(d) { return "translate(" + plot.x.scale(d.x) + "," + (plot.y.scale(d.y)) + ")"; });
+
         barRectT
             .attr("width",  plot.x.scale(plot.histogramBins[0].dx) - plot.x.scale(0)- 1)
             .attr("height", d =>   plot.height - plot.y.scale(d.y));

diff --git a/src/regression.js b/src/regression.js
@@ -266,7 +266,7 @@ export class Regression extends ScatterPlot{
 
 
         var lineT = line;
-        if (self.config.transition) {
+        if (self.transitionEnabled()) {
             lineT = line.transition();
         }
 
@@ -285,7 +285,7 @@ export class Regression extends ScatterPlot{
         var area = regression.select("path."+confidenceAreaClass);
 
         var areaT = area;
-        if (self.config.transition) {
+        if (self.transitionEnabled()) {
             areaT = area.transition();
         }
         areaT.attr("d", r => r.confidence.area(r.confidence.points));

diff --git a/src/scatterplot.js b/src/scatterplot.js
@@ -164,7 +164,7 @@ export class ScatterPlot extends Chart{
             .attr("transform", "translate(0," + plot.height + ")");
 
         var axisT = axis;
-        if (self.config.transition) {
+        if (self.transitionEnabled()) {
             axisT = axis.transition().ease("sin-in-out");
         }
 
@@ -184,7 +184,7 @@ export class ScatterPlot extends Chart{
         var axis = self.svgG.selectOrAppend("g."+self.prefixClass('axis-y')+"."+self.prefixClass('axis')+(self.config.guides ? '' : '.'+self.prefixClass('no-guides')));
 
         var axisT = axis;
-        if (self.config.transition) {
+        if (self.transitionEnabled()) {
             axisT = axis.transition().ease("sin-in-out");
         }
 
@@ -224,7 +224,7 @@ export class ScatterPlot extends Chart{
             .attr("class", dotClass);
 
         var dotsT = dots;
-        if (self.config.transition) {
+        if (self.transitionEnabled()) {
             dotsT = dots.transition();
         }