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

Renato De Donato
2 parents f6aff0c5 addc5f69
Showing 2 changed files with 14 additions and 15 deletions
datalets/datasetexplorer-datalet/datasetexplorer-datalet.html
datalets/datasetexplorer-datalet/js/buildtreemap.js
@@ -109,17 +109,6 @@ Example:
             :host ::content .children:hover rect.child {
                 fill: #bbb;
             }
-
-            :host ::content .spinner  {
-                position: absolute;
-                left: 50%;
-                top: 50%;
-                width: 160px;
-                height: 160px;
-                margin-left: -80px;
-                margin-top: -80px;
-
-            }
         </style>
         <div id="treemap_placeholder"></div>
         <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></base-ajax-json-jsonpath-datalet>
@@ -199,7 +188,7 @@ Example:
                 var xyz = function(url) {
                     me.selectResource(url);
                 }
-                build(this.map, "treemap_placeholder", xyz);
+                build(this.map, "treemap_placeholder", xyz, this._component.width, this._component.height);
             },
  
             selectResource: function(url) {
@@ -233,6 +222,16 @@ Example:
                 behavior : {
                     type : Object,
                     value : {}
+                },
+
+                width : {
+                    type : Number,
+                    value: -1
+                },
+
+                height : {
+                    type : Number,
+                    value: -1
                 }
             },
  
@@ -2,10 +2,10 @@
  * Created by Utente on 17/07/2015.
  */
  
-function build(root, place_holder, select_listener) {
+function build(root, place_holder, select_listener, width, height) {
  
-    var plwidth = $("#" + place_holder).width(),
-        plheight = $("#" + place_holder).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,