Merge branch 'force-tick' into v2.8.0

Polychart · Feb 22, 2012 · 522e269 · 522e269
2 parents 0aed1e4 + 56818fd
commit 522e269
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/d3.v2.js b/d3.v2.js
@@ -5129,7 +5129,7 @@ d3.layout.force = function() {
     };
   }
 
-  function tick() {
+  force.tick = function() {
     // simulated annealing, basically
     if ((alpha *= .99) < .005) return true;
 
@@ -5197,7 +5197,7 @@ d3.layout.force = function() {
     }
 
     event.tick({type: "tick", alpha: alpha});
-  }
+  };
 
   force.nodes = function(x) {
     if (!arguments.length) return nodes;
@@ -5333,7 +5333,7 @@ d3.layout.force = function() {
 
   force.resume = function() {
     alpha = .1;
-    d3.timer(tick);
+    d3.timer(force.tick);
     return force;
   };