homeflowjs 1.0.99 → 1.0.101

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "1.0.99",
+  "version": "1.0.101",
   "sideEffects": [
     "modal/**/*",
     "user/default-profile/**/*",

package/properties/properties-map/draggable-map.js

@@ -231,17 +231,34 @@ export default class DraggableMap {
     marker.property = property;
 
     if (!Homeflow.get('do_not_show_marker_popup')) {
-      const popupTemplate = document.getElementById('property-map-popup-template').innerHTML;
-      const compiled = template(popupTemplate);
-      const t = compiled({ property });
+      const lodashTemplatePopup = document.getElementById('property-map-popup-template');
+      const liquidTemplatePopup = document.querySelector(`.property-map-popup-template[data-property-id="${property.property_id}"]`);
 
-      Homeflow.kickEvent('map_marker_rendered', property);
-      const popup = new L.Point(Homeflow.get('autopan_padding')[0], Homeflow.get('autopan_padding')[1]);
-      marker.bindPopup(t, { autoPanPadding: popup, autoPan: !Homeflow.get('disable_map_pop_up_scroll') });
+      if (lodashTemplatePopup) {
+        const compiled = template(lodashTemplatePopup.innerHTML);
+        const t = compiled({ property });
 
-      if (Homeflow.get('pop_up_on_mouseover')) {
-        marker.on("mouseover", e => marker.openPopup());
-        marker.on("mouseout", e => setTimeout((() => marker.closePopup()), 4000));
+        Homeflow.kickEvent('map_marker_rendered', property);
+        const popup = new L.Point(Homeflow.get('autopan_padding')[0], Homeflow.get('autopan_padding')[1]);
+        marker.bindPopup(t, { autoPanPadding: popup, autoPan: !Homeflow.get('disable_map_pop_up_scroll') });
+
+        if (Homeflow.get('pop_up_on_mouseover')) {
+          marker.on("mouseover", e => marker.openPopup());
+          marker.on("mouseout", e => setTimeout((() => marker.closePopup()), 4000));
+        }
+      }
+
+      if (liquidTemplatePopup) {
+        const html = liquidTemplatePopup.innerHTML;
+
+        Homeflow.kickEvent('map_marker_rendered', property);
+        const popup = new L.Point(Homeflow.get('autopan_padding')[0], Homeflow.get('autopan_padding')[1]);
+        marker.bindPopup(html, { autoPanPadding: popup, autoPan: !Homeflow.get('disable_map_pop_up_scroll') });
+
+        if (Homeflow.get('pop_up_on_mouseover')) {
+          marker.on("mouseover", e => marker.openPopup());
+          marker.on("mouseout", e => setTimeout((() => marker.closePopup()), 4000));
+        }
       }
     }
 
@@ -250,6 +267,7 @@ export default class DraggableMap {
     if (Homeflow.get('select_marker_on_click')) {
       marker.on('click', e => store.dispatch(setSelectedMarker(e.target)));
     }
+    
     return window['map_marker_' + property.property_id] = marker;
   }
 
@@ -663,7 +681,8 @@ export default class DraggableMap {
 
     const params = [];
 
-    if ((search.type) && (search.type !== "")) { params.push("tag-" + search.type); }
+    if ((search.type) && (search.type !== "")) { params.push("tag-" + search.type); } 
+    if (search.tags && search.tags.length) { params.push("tag-" + search.tags.join(',')); }
     if (search.minBeds) { params.push("from-" + search.minBeds + "-bed"); }
     if (search.maxBeds) { params.push("up-to-" + search.maxBeds + "-bed"); }