GraphViewer: Added/Tested default colouring of Edges and nodes

html/admin/js/graphViewer/graph/edgeShaper.js

@@ -298,10 +298,24 @@ function EdgeShaper(parent, flags, idfunc) {
   while (toplevelSVG[0][0] && toplevelSVG[0][0].ownerSVGElement) {
     toplevelSVG = d3.select(toplevelSVG[0][0].ownerSVGElement);
   }
-   
-  if (flags !== undefined) {
-    parseConfig(flags);
-  } 
+  
+  if (flags === undefined) {
+    flags = {
+      color: {
+        type: "single",
+        stroke: "#686766"
+      }
+    };
+  }
+  
+  if (flags.color === undefined) {
+    flags.color = {
+      type: "single",
+      stroke: "#686766"
+    };
+  }
+
+  parseConfig(flags);
 
   if (_.isFunction(idfunc)) {
     idFunction = idfunc;

html/admin/js/graphViewer/graph/nodeShaper.js

@@ -260,28 +260,24 @@ function NodeShaper(parent, flags, idfunc) {
     
   self.parent = parent;
   
-  if (flags !== undefined) {
-    parseConfig(flags);
-    /*
+  if (flags === undefined) {
     flags = {
       color: {
         type: "single",
-        stroke: "#FF8F35",
-        fill: "#8AA051"
+        fill: "#FF8F35",
+        stroke: "#8AA051"
       }
     };
-    */
   }
-  /*
+  
   if (flags.color === undefined) {
     flags.color = {
       type: "single",
-      stroke: "#FF8F35",
-      fill: "#8AA051"
-    };
-    
+      fill: "#FF8F35",
+      stroke: "#8AA051"
+    }; 
   }
-  */
+  parseConfig(flags);
 
   if (_.isFunction(idfunc)) {
     idFunction = idfunc;

html/admin/js/graphViewer/jasmine_test/specEdgeShaper/edgeShaperSpec.js

@@ -250,7 +250,23 @@
     });
     
     describe('testing for colours', function() {
-            
+      
+      it('should have a default colouring of no colour flag is given', function() {
+        var nodes = [{_id: 1}, {_id: 2}],
+        edges = [{
+          source: nodes[0],
+          target: nodes[1]
+        },{
+          source: nodes[1],
+          target: nodes[0]
+        }],
+        shaper = new EdgeShaper(d3.select("svg"));
+        shaper.drawEdges(edges);
+        
+        expect($("#1-2 line").attr("stroke")).toEqual("#686766");
+        expect($("#2-1 line").attr("stroke")).toEqual("#686766");
+      });
+      
       it('should be able to use the same colour for all edges', function() {
         var s = {_id: 1},
         t = {_id: 2},

html/admin/js/graphViewer/style/graphlayout.css

@@ -1,31 +1,9 @@
-.link {
-  fill: none;
-  stroke: #666;
-  stroke-width: 1px;
-}
-
-.edgegradient {
-  stroke: url("#edgegradient");
-}
-
-.node {
-  cursor: pointer;
-  fill: #ccc;
-  stroke: #fff;
-  stroke-width: 1px;
-}
-
-
 text {
   font: 10px sans-serif;
   pointer-events: none;
   stroke: #fff;
   stroke-width: 1px;
 }
-marker#arrow {
-  fill: #666;
-}
-
 
 capitalize {
     text-transform:capitalize;