Updated tests to the new API. TM tests not working

Will check that later.
bdionne · Feb 5, 2010 · e4af22e · e4af22e
1 parent bb8b50f
commit e4af22e
Show file tree

Hide file tree

Showing 27 changed files with 558 additions and 585 deletions.
diff --git a/Source/Core/Canvas.js b/Source/Core/Canvas.js
@@ -116,14 +116,13 @@
  The _init_ method is only called once, at the instanciation of the background canvas.
  The _plot_ method is called for plotting a Canvas image.
  */
-this.Canvas = (function(){
+var Canvas = (function(){
     var config = {
         'injectInto': 'id',
         'width': false,
         'height': false,
         'useCanvas': false,
         'labels': 'HTML', //can also be 'SVG' or 'Native'
-
         'backgroundCanvas': false
     };
 

diff --git a/Source/Core/Core.js b/Source/Core/Core.js
@@ -364,7 +364,7 @@ var Event = {
 };
 
 //common json manipulation methods
-$jit.$json = {
+$jit.json = {
 
   /*
      Method: prune

diff --git a/Source/Graph/Graph.js b/Source/Graph/Graph.js
@@ -46,7 +46,7 @@
  
 */  
 
-this.Graph = new Class({
+var Graph = new Class({
 
  initialize: function(opt, Node, Edge) {
     var innerOptions = {

diff --git a/Source/Visualizations/ForceDirected.js b/Source/Visualizations/ForceDirected.js
@@ -144,8 +144,13 @@ $jit.ForceDirected = new Class( {
         "Fx", "Tips", "NodeStyles", "Controller"), config, controller);
 
     var canvasConfig = this.config;
-    this.config.labelContainer = canvasConfig.injectInto + '-label';
-    this.canvas = new Canvas(canvasConfig);
+    if(canvasConfig.useCanvas) {
+      this.canvas = canvasConfig.useCanvas;
+      this.config.labelContainer = this.canvas.id + '-label';
+    } else {
+      this.canvas = new Canvas(canvasConfig);
+      this.config.labelContainer = canvasConfig.injectInto + '-label';
+    }
 
     this.graphOptions = {
       'complex': true,

diff --git a/Source/Visualizations/Hypertree.js b/Source/Visualizations/Hypertree.js
@@ -255,8 +255,13 @@ $jit.Hypertree = new Class( {
         "Fx", "Tips", "NodeStyles", "Controller"), config, controller);
 
     var canvasConfig = this.config;
-    this.config.labelContainer = canvasConfig.injectInto + '-label';
-    this.canvas = new Canvas(canvasConfig);
+    if(canvasConfig.useCanvas) {
+      this.canvas = canvasConfig.useCanvas;
+      this.config.labelContainer = this.canvas.id + '-label';
+    } else {
+      this.canvas = new Canvas(canvasConfig);
+      this.config.labelContainer = canvasConfig.injectInto + '-label';
+    }
 
     this.graphOptions = {
       'complex': false,

diff --git a/Source/Visualizations/RGraph.js b/Source/Visualizations/RGraph.js
@@ -153,8 +153,13 @@ $jit.RGraph = new Class( {
         "Fx", "Controller", "Tips", "NodeStyles"), config, controller);
 
     var canvasConfig = this.config;
-    this.config.labelContainer = canvasConfig.injectInto + '-label';
-    this.canvas = new Canvas(canvasConfig);
+    if(canvasConfig.useCanvas) {
+      this.canvas = canvasConfig.useCanvas;
+      this.config.labelContainer = this.canvas.id + '-label';
+    } else {
+      this.canvas = new Canvas(canvasConfig);
+      this.config.labelContainer = canvasConfig.injectInto + '-label';
+    }
 
     this.graphOptions = {
       'complex': false,

diff --git a/Source/Visualizations/Spacetree.js b/Source/Visualizations/Spacetree.js
@@ -221,8 +221,14 @@ $jit.ST= (function() {
                     "Tips", "NodeStyles"), config, controller);
 
             var canvasConfig = this.config;
-            this.config.labelContainer = canvasConfig.injectInto + '-label';
-            this.canvas = new Canvas(canvasConfig);
+            if(canvasConfig.useCanvas) {
+              this.canvas = canvasConfig.useCanvas;
+              this.config.labelContainer = this.canvas.id + '-label';
+            } else {
+              this.canvas = new Canvas(canvasConfig);
+              this.config.labelContainer = canvasConfig.injectInto + '-label';
+            }
+
             this.graphOptions = {
                 'complex': true
             };

diff --git a/Source/Visualizations/Sunburst.js b/Source/Visualizations/Sunburst.js
@@ -157,8 +157,13 @@ $jit.Sunburst = new Class({
         "Fx", "Tips", "NodeStyles", "Controller"), config, controller);
 
     var canvasConfig = this.config;
-    this.config.labelContainer = canvasConfig.injectInto + '-label';
-    this.canvas = new Canvas(canvasConfig);
+    if(canvasConfig.useCanvas) {
+      this.canvas = canvasConfig.useCanvas;
+      this.config.labelContainer = this.canvas.id + '-label';
+    } else {
+      this.canvas = new Canvas(canvasConfig);
+      this.config.labelContainer = canvasConfig.injectInto + '-label';
+    }
 
     this.graphOptions = {
       'complex': false,
@@ -389,7 +394,7 @@ $jit.Sunburst.$extend = true;
 
   */
   Sunburst.Label.Native = new Class( {
-    Extends: Graph.Label.Native,
+    Implements: Graph.Label.Native,
 
     initialize: function(viz) {
       this.viz = viz;
@@ -644,9 +649,9 @@ $jit.Sunburst.$extend = true;
 
         var ctx = canvas.getCtx();
         ctx.moveTo(0, 0);
+        ctx.beginPath();
         ctx.arc(0, 0, polarNode.rho, begin, end, false);
         ctx.arc(0, 0, polarNode.rho + ldist, end, begin, true);
-        ctx.beginPath();
         ctx.moveTo(p1coord.x, p1coord.y);
         ctx.lineTo(p4coord.x, p4coord.y);
         ctx.moveTo(p2coord.x, p2coord.y);