From 66cd5ab70e9e29e553bc909e8d6785a4d6c439d3 Mon Sep 17 00:00:00 2001
From: andrpet <andrpet@gmail.com>
Date: Fri, 11 Mar 2016 13:01:02 +0100
Subject: [PATCH] dataset explorer cache

---
 controllets/data-sevc-controllet/data-sevc-controllet.html                 | 2 +-
 controllets/dataset-selection-controllet/dataset-selection-controllet.html | 4 ++--
 datalets/leafletjs-datalet/leafletjs-datalet.html                          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/controllets/data-sevc-controllet/data-sevc-controllet.html b/controllets/data-sevc-controllet/data-sevc-controllet.html
index 6ab3c81..8c3799e 100755
--- a/controllets/data-sevc-controllet/data-sevc-controllet.html
+++ b/controllets/data-sevc-controllet/data-sevc-controllet.html
@@ -19,7 +19,7 @@
             <neon-animatable>
 
                 <template is="dom-if" if={{!modify}}>
-                    <dataset-selection-controllet id="select_dataset" datasets={{datasets}} suggested-datasets={{suggestedDatasets}}></dataset-selection-controllet>
+                    <dataset-selection-controllet id="select_dataset" data={{data}} datasets={{datasets}} suggested-datasets={{suggestedDatasets}}></dataset-selection-controllet>
                 </template>
 
             </neon-animatable>
diff --git a/controllets/dataset-selection-controllet/dataset-selection-controllet.html b/controllets/dataset-selection-controllet/dataset-selection-controllet.html
index 96fe7bd..f9ef224 100755
--- a/controllets/dataset-selection-controllet/dataset-selection-controllet.html
+++ b/controllets/dataset-selection-controllet/dataset-selection-controllet.html
@@ -290,8 +290,8 @@
             _loadTreeMap : function(){
                 var h = $("#material_container").height() - 48;
                 var w = $("#material_container").width();
-                //                                                                                                          /oxwall_x.y.z
-                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>";
+
+                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>";
             },
 
             _selectDataUrl_treeMap : function(e) {
diff --git a/datalets/leafletjs-datalet/leafletjs-datalet.html b/datalets/leafletjs-datalet/leafletjs-datalet.html
index 6997914..dc487bc 100755
--- a/datalets/leafletjs-datalet/leafletjs-datalet.html
+++ b/datalets/leafletjs-datalet/leafletjs-datalet.html
@@ -103,7 +103,7 @@ Example:
 
                         if(t.data.length > 2)
                         {
-                            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})+)(/(.)*)?(\\?(.)*)?")))
+                            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})+)(/(.)*)?(\\?(.)*)?")))
                                var popup = L.popup().setContent('<image height="100" width="100" src="' + t.data[t.data.length - 1].data[i] + '" />');
                             else
                                 var popup = L.popup().setContent('<span>' + t.data[t.data.length - 1].data[i] + '</span>');
--
libgit2 0.21.4