Merge branch 'master' of http://service.routetopa.eu:7480/WebCompDev/COMPONENTS

isisadmin
2 parents 8c7f320c fdb0e067
Showing 6 changed files with 25 additions and 2 deletions
controllets/animated-grid-controllet/animated-grid-controllet.html
controllets/fullsize-page-with-card-controllet/fullsize-page-with-card-controllet.html
datalets/base-datalet/static/images/spin.svg
datalets/graph-datalet/graph-datalet.html
datalets/graph-datalet/static/css/graphStyle.css
datalets/graph-datalet/static/js/d3.v3.js
@@ -130,6 +130,21 @@ Example:
                         .attr("width", width)
                         .attr("height", height);
  
+                this.svg.append("defs")
+                        .append("pattern")
+                            .attr("id","urlimage")
+                            .attr("patternUnits","userSpaceOnUse")
+                            .attr("width","320")
+                            .attr("height","320")
+                        .append("image")
+                            .attr("xlink:href","http://lorempixel.com/400/200")
+                            .attr("patternUnits","userSpaceOnUse")
+                            .attr("x","0")
+                            .attr("y","0")
+                            .attr("width","400")
+                            .attr("height","200");
+
+
                 var graph = {};
  
                 graph.nodes = t.nodes;
@@ -157,10 +172,18 @@ Example:
                                                                                                     return t.fixed ? "" : "drag"
                                                                                                 }).attr("r", function (t) {
                                                                                                     return t.r ? t.r : 15
-                                                                                                }).attr("style", function (t) {
+                                                                                                })
+                                                                                                .attr("style", function (t) {
                                                                                                     return t.color ? "stroke:" + t.color : !1
                                                                                                 });
  
+                d3.selectAll('circle').style("fill", function(t){return  t.image ? 'url(#urlimage)' : ""})/*.append("svg:image")
+                        .attr('xlink:href', function(t){
+                            return t.image ? t.image : "";
+                        })
+                        .attr('width', 150)
+                        .attr('height', 200);*/
+
                 //d3.selectAll(".drag").call(force.drag), svg.selectAll("g.fixed").call(text);
                 d3.selectAll(".drag").call(force.drag), this.svg.selectAll("g.node").call(this.text);
  
@@ -217,7 +240,7 @@ Example:
             mouseover : function (t) {
                 d3.select(this).selectAll("circle").transition().duration(600).ease("elastic").attr("r", function (t) {
                     //return 1 == t.fixed ? 1.4 * t.r : 15
-                    return 1 == t.fixed ? 1.4 * t.r : 15
+                    return 1 == t.fixed ? 1.4 * t.r : t.r + 10;
                 });
  
             },