From 7e835531422b8885fe33a542a57fb3642fb67ace Mon Sep 17 00:00:00 2001
From: andrpet <andrpet@gmail.com>
Date: Fri, 18 Dec 2015 17:53:34 +0100
Subject: [PATCH] generic cards container controllet

---
 controllets/fullsize-page-with-card-controllet/fullsize-page-with-card-controllet.html |  7 ++++++-
 controllets/generic-cards-container-controllet/generic-cards-container-controllet.html |  8 ++++++++
 datalets/leafletjs-datalet/leafletjs-datalet.html                                      | 67 +++++++++++++++++++++++++++++++++++--------------------------------
 3 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/controllets/fullsize-page-with-card-controllet/fullsize-page-with-card-controllet.html b/controllets/fullsize-page-with-card-controllet/fullsize-page-with-card-controllet.html
index 1dd53f2..e065d51 100755
--- a/controllets/fullsize-page-with-card-controllet/fullsize-page-with-card-controllet.html
+++ b/controllets/fullsize-page-with-card-controllet/fullsize-page-with-card-controllet.html
@@ -38,7 +38,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         <div id="fixed" class="fixed" style$="background-color:{{color}}"></div>
         <div id="card" class="card" style$="background-color:{{color}}">
             <template is="dom-if" if="{{_checkUndefined(publicRoom)}}">
-                <iframe id="public_room_iframe" src="public-room/{{publicRoom}}" width="100%" height="100%"></iframe>
+                <iframe id="public_room_iframe" src="/public-room/{{publicRoom}}" width="100%" height="100%"></iframe>
             </template>
         </div>
 
@@ -122,6 +122,11 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
         _computeFixedBackgroundClass: function(color) {
             this.$.fixed = color;
+        },
+
+        attached: function()
+        {
+            this.fire('fullsize-page-with-card-controllet_attached');
         }
 
     });
diff --git a/controllets/generic-cards-container-controllet/generic-cards-container-controllet.html b/controllets/generic-cards-container-controllet/generic-cards-container-controllet.html
index 7a8e621..9fb1788 100755
--- a/controllets/generic-cards-container-controllet/generic-cards-container-controllet.html
+++ b/controllets/generic-cards-container-controllet/generic-cards-container-controllet.html
@@ -91,6 +91,14 @@ Example:
                 display: none;
             }
 
+            ::content .card_grid .modify{
+                display: none;
+            }
+
+            ::content .card_grid .open{
+                display: none;
+            }
+
             ::content .empty{
                 position: absolute;
                 right: 0;
diff --git a/datalets/leafletjs-datalet/leafletjs-datalet.html b/datalets/leafletjs-datalet/leafletjs-datalet.html
index 106b6bb..2ba78a2 100755
--- a/datalets/leafletjs-datalet/leafletjs-datalet.html
+++ b/datalets/leafletjs-datalet/leafletjs-datalet.html
@@ -52,7 +52,7 @@ Example:
     <template>
         <link rel="stylesheet" href="leafletsjs/leaflet.css" />
         <style>
-            #leafletjs { height: 600px; }
+            #leafletjs {height: 600px;}
         </style>
 
         <div id="leafletjs"></div>
@@ -73,32 +73,45 @@ Example:
              * @method transformData
              */
             presentData: function(){
-            	            	             
-				var coordinates = [];
-                var isArray = (this.data[0].data[0].constructor === Array) ? true : false;
 
-                for(var i=0; i<this.data[0].data.length; i++)
-                {
-                    if(isArray)
-                        coordinates.push([parseFloat(this.data[0].data[i][0]), parseFloat(this.data[0].data[i][1])]);
-                    else
-                        coordinates.push([parseFloat(this.data[0].data[i]), parseFloat(this.data[1].data[i])]);
+                var t = this;
+                this._component.map = L.map(this._component.$.leafletjs).setView([0, 0], 13, {reset:true});
+
+                L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+                    maxZoom: 18,
+                    attribution: 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors'
+                }).addTo(this._component.map);
+
+                setTimeout(function() {
 
-                    var marker = L.marker([coordinates[i][0], coordinates[i][1]]).addTo(this._component.map);
+                    L.Icon.Default.imagePath = 'http://services.routetopa.eu/DEEalerProvider/COMPONENTS/datalets/leafletjs-datalet/leafletsjs/images';
 
-                    if(this.data.length > 2)
+                    var coordinates = [];
+                    var isArray = t.data[0].data[0].constructor === Array;
+
+                    for(var i=0; i<t.data[0].data.length; i++)
                     {
-                        if(this.data[this.data.length - 1].data[i].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="' + this.data[this.data.length - 1].data[i] + '" />');
+                        if(isArray)
+                            coordinates.push([parseFloat(t.data[0].data[i][0]), parseFloat(t.data[0].data[i][1])]);
                         else
-                            var popup = L.popup().setContent('<span>' + this.data[this.data.length - 1].data[i] + '</span>');
-                        marker.bindPopup(popup);
+                            coordinates.push([parseFloat(t.data[0].data[i]), parseFloat(t.data[1].data[i])]);
+
+                        var marker = L.marker([coordinates[i][0], coordinates[i][1]]).addTo(t._component.map);
+
+                        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})+)(/(.)*)?(\\?(.)*)?")))
+                               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>');
+                            marker.bindPopup(popup);
+                        }
                     }
-                }
 
-                this._component.map.invalidateSize();
-                this._component.map.fitBounds(coordinates);            	
-            	
+                    t._component.map._onResize();
+                    t._component.map.invalidateSize(false);
+                    t._component.map.fitBounds(coordinates);
+                }, 1000)
             }
         };
 
@@ -148,19 +161,9 @@ Example:
              *
              * @method ready
              */
-            ready: function(){
-
-				this.map = L.map(this.$.leafletjs).setView([0, 0], 13);
-
-                L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-                    maxZoom: 18,
-                    attribution: 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors'
-                }).addTo(this.map);
-
-                L.Icon.Default.imagePath = 'http://services.routetopa.eu/DEEalerProvider/COMPONENTS/datalets/leafletjs-datalet/leafletsjs/images';
-
+            attached: function(){
                 this.behavior =  $.extend(true, {}, BaseDataletBehavior, WorkcycleBehavior, AjaxJsonJsonPathBehavior, leafletjsBehavior);
-                this.async(function(){this.behavior.init(this)},0);
+                this.behavior.init(this);
             }
         });
     </script>
--
libgit2 0.21.4