treemap conflict

Renato De Donato
1 parent fcfe75af
Showing 2 changed files with 10 additions and 11 deletions
datalets/datasetexplorer-datalet/datasetexplorer-datalet.html
datalets/datasetexplorer-datalet/js/buildtreemap.js → datalets/datasetexplorer-datalet/js/buildtreemap2.js
@@ -120,7 +120,7 @@ Example:
     </template>
  
     <script src="../shared_js/d3.js"></script>
-    <script src="js/buildtreemap.js"></script>
+    <script src="js/buildtreemap2.js"></script>
     <script>
  
         var DatasetexplorerBehavior = {
@@ -130,7 +130,8 @@ Example:
                 children : []
             },
  
-            transformData: function(e){
+            transformData: function(e)
+            {
                 var treemapData = [];
                 DatasetexplorerBehavior.map.name = this._component.title;
  
@@ -192,7 +193,7 @@ Example:
                 var xyz = function(url) {
                     me.selectResource(url);
                 }
-                build(this.map, this.meta, "treemap_placeholder", xyz, this._component.width, this._component.height);
+                build2(this.map, this.meta, this._component.$.treemap_placeholder, xyz, this._component.width, this._component.height);
             },
  
             selectResource: function(url) {
@@ -223,9 +224,9 @@ Example:
                     });
                 }
                 this.deleteWaitImage();
-            },
-        };
+            }
  
+        };
  
         Polymer({
             is : 'datasetexplorer-datalet' ,
@@ -2,10 +2,9 @@
  * Created by Utente on 17/07/2015.
  */
  
-function build(root, meta, place_holder, select_listener, width, height) {
-
-    var plwidth = width >= 0 ? width : $("#" + place_holder).width(),
-        plheight = height >= 0 ? height : $("#" + place_holder).height();
+function build2(root, meta, place_holder, select_listener, width, height) {
+    var plwidth = width >= 0 ? width : $(place_holder).width(),
+        plheight = height >= 0 ? height : $(place_holder).height();
  
     var margin = {top: 20, right: 0, bottom: 0, left: 0},
         width  = plwidth,
@@ -27,8 +26,7 @@ function build(root, meta, place_holder, select_listener, width, height) {
         .ratio(height / width * 0.5 * (1 + Math.sqrt(5)))
         .round(false);
  
-    var svg = d3.select("#" + place_holder)
-        .append("svg")
+    var svg = d3.select(place_holder).append("svg")
         .attr("width", width + margin.left + margin.right)
         .attr("height", height + margin.bottom + margin.top)
         .style("margin-left", -margin.left + "px")