tweak scatterplot transition

tttp · Oct 15, 2013 · f24bee8 · f24bee8
1 parent dcaa790
commit f24bee8
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 29 deletions.
diff --git a/dc.js b/dc.js
@@ -183,7 +183,7 @@ dc.transition = function(selections, duration, callback) {
         .transition()
         .duration(duration);
 
-    if (callback instanceof Function) {
+    if (typeof(callback) === 'function') {
         callback(s);
     }
 
@@ -5547,14 +5547,12 @@ dc.scatterPlot = function (parent, chartGroup) {
             .attr("class", "symbol")
             .attr("transform", _locator);
 
-        dc.transition(symbols, _chart.transitionDuration(), function (symbols) {
-            symbols.attr("transform", _locator)
-                .attr("r", _symbolSize);
-        });
+        dc.transition(symbols, _chart.transitionDuration())
+            .attr("transform", _locator)
+            .attr("r", _symbolSize);
 
-        dc.transition(symbols.exit(), _chart.transitionDuration(), function (symbols) {
-            symbols.attr("r", 0).remove();
-        });
+        dc.transition(symbols.exit(), _chart.transitionDuration())
+            .attr("r", 0).remove();
     };
 
     /**

diff --git a/dc.min.js b/dc.min.js
diff --git a/dc.min.js.map b/dc.min.js.map
diff --git a/src/core.js b/src/core.js
@@ -162,7 +162,7 @@ dc.transition = function(selections, duration, callback) {
         .transition()
         .duration(duration);
 
-    if (callback instanceof Function) {
+    if (typeof(callback) === 'function') {
         callback(s);
     }
 

diff --git a/src/scatter-plot.js b/src/scatter-plot.js
@@ -17,14 +17,12 @@ dc.scatterPlot = function (parent, chartGroup) {
             .attr("class", "symbol")
             .attr("transform", _locator);
 
-        dc.transition(symbols, _chart.transitionDuration(), function (symbols) {
-            symbols.attr("transform", _locator)
-                .attr("r", _symbolSize);
-        });
-
-        dc.transition(symbols.exit(), _chart.transitionDuration(), function (symbols) {
-            symbols.attr("r", 0).remove();
-        });
+        dc.transition(symbols, _chart.transitionDuration())
+            .attr("transform", _locator)
+            .attr("r", _symbolSize);
+
+        dc.transition(symbols.exit(), _chart.transitionDuration())
+            .attr("r", 0).remove();
     };
 
     /**

diff --git a/test/scatterplot-test.js b/test/scatterplot-test.js
@@ -58,7 +58,7 @@ suite.addBatch({
         topic: function () {
             var chart = buildChart('scatter-plot-update');
             valueDimension.filter(66);
-            chart.render();
+            chart.redraw();
             return chart;
         },
 

diff --git a/web/js/dc.js b/web/js/dc.js
@@ -183,7 +183,7 @@ dc.transition = function(selections, duration, callback) {
         .transition()
         .duration(duration);
 
-    if (callback instanceof Function) {
+    if (typeof(callback) === 'function') {
         callback(s);
     }
 
@@ -5547,14 +5547,12 @@ dc.scatterPlot = function (parent, chartGroup) {
             .attr("class", "symbol")
             .attr("transform", _locator);
 
-        dc.transition(symbols, _chart.transitionDuration(), function (symbols) {
-            symbols.attr("transform", _locator)
-                .attr("r", _symbolSize);
-        });
+        dc.transition(symbols, _chart.transitionDuration())
+            .attr("transform", _locator)
+            .attr("r", _symbolSize);
 
-        dc.transition(symbols.exit(), _chart.transitionDuration(), function (symbols) {
-            symbols.attr("r", 0).remove();
-        });
+        dc.transition(symbols.exit(), _chart.transitionDuration())
+            .attr("r", 0).remove();
     };
 
     /**