SGH / COMPONENTS

Commit 66cd5ab70e9e29e553bc909e8d6785a4d6c439d3

Authored by Andrea Petta
1 parent 92bd14f2

dataset explorer cache

Inline Side-by-side
Showing 3 changed files with 4 additions and 4 deletions
controllets/data-sevc-controllet/data-sevc-controllet.html
  View file @66cd5ab
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <neon-animatable> 19 <neon-animatable>
20 20
21 <template is="dom-if" if={{!modify}}> 21 <template is="dom-if" if={{!modify}}>
22 - <dataset-selection-controllet id="select_dataset" datasets={{datasets}} suggested-datasets={{suggestedDatasets}}></dataset-selection-controllet> 22 + <dataset-selection-controllet id="select_dataset" data={{data}} datasets={{datasets}} suggested-datasets={{suggestedDatasets}}></dataset-selection-controllet>
23 </template> 23 </template>
24 24
25 </neon-animatable> 25 </neon-animatable>
controllets/dataset-selection-controllet/dataset-selection-controllet.html
  View file @66cd5ab
@@ -290,8 +290,8 @@ @@ -290,8 +290,8 @@
290 _loadTreeMap : function(){ 290 _loadTreeMap : function(){
291 var h = $("#material_container").height() - 48; 291 var h = $("#material_container").height() - 48;
292 var w = $("#material_container").width(); 292 var w = $("#material_container").width();
293 - // /oxwall_x.y.z  
294 - this.$.div_datasetexplorer.innerHTML = "<datasetexplorer-datalet width=\""+w+"\" height=\""+h+"\" data-url=\"/openwall/api/datasetTree\" fields='[\"result,datasets,provider_name\",\"result,datasets,organization_name\",\"result,datasets,package_name\",\"result,datasets,resource_name\",\"result,datasets,url\",\"result,datasets,w\"]'></datasetexplorer-datalet>"; 293 +
  294 + this.$.div_datasetexplorer.innerHTML = "<datasetexplorer-datalet data='"+this.data+"' width=\""+w+"\" height=\""+h+"\" data-url=\"/openwall/api/datasetTree\" fields='[\"result,datasets,provider_name\",\"result,datasets,organization_name\",\"result,datasets,package_name\",\"result,datasets,resource_name\",\"result,datasets,url\",\"result,datasets,w\"]'></datasetexplorer-datalet>";
295 }, 295 },
296 296
297 _selectDataUrl_treeMap : function(e) { 297 _selectDataUrl_treeMap : function(e) {
datalets/leafletjs-datalet/leafletjs-datalet.html
  View file @66cd5ab
@@ -103,7 +103,7 @@ Example: @@ -103,7 +103,7 @@ Example:
103 103
104 if(t.data.length > 2) 104 if(t.data.length > 2)
105 { 105 {
106 - if(t.data[t.data.length - 1].data[i].match(new RegExp("^(http[s]?:\/\/(www\.)?|ftp:\/\/(www\.)?|www\.){1}([0-9A-Za-z-\.@:%_~#=]+)+((\.[a-zA-Z]{2,3})+)(/(.)*)?(\?(.)*)?"))) 106 + if(t.data[t.data.length - 1].data[i].toString().match(new RegExp("^(http[s]?:\/\/(www\.)?|ftp:\/\/(www\.)?|www\.){1}([0-9A-Za-z-\.@:%_~#=]+)+((\.[a-zA-Z]{2,3})+)(/(.)*)?(\?(.)*)?")))
107 var popup = L.popup().setContent('<image height="100" width="100" src="' + t.data[t.data.length - 1].data[i] + '" />'); 107 var popup = L.popup().setContent('<image height="100" width="100" src="' + t.data[t.data.length - 1].data[i] + '" />');
108 else 108 else
109 var popup = L.popup().setContent('<span>' + t.data[t.data.length - 1].data[i] + '</span>'); 109 var popup = L.popup().setContent('<span>' + t.data[t.data.length - 1].data[i] + '</span>');