hoodcms 6.0.5 → 6.0.8

package/src/js/app.property.js

@@ -1,5 +1,5 @@
 /*!
-* hoodcms v6.0.5
+* hoodcms v6.0.8
 * A fully customisable content management system built in ASP.NET Core 5 & Bootstrap 5.
 * Written by George Whysall, 2022
 * Released under the GPL-3.0 License.
@@ -383,12 +383,12 @@
 
     var Validator = /** @class */ (function () {
         /**
-          * @param element The datalist element. The element must have a data-url attribute to connect to a feed.
-          */
+         * @param element The datalist element. The element must have a data-url attribute to connect to a feed.
+         */
         function Validator(element, options) {
             this.options = {
-                errorAlert: 'There are errors on the form, please check your answers and try again.',
-                useAjax: true
+                errorAlert: "There are errors on the form, please check your answers and try again.",
+                useAjax: true,
             };
             this.element = element;
             if (!this.element) {
@@ -399,7 +399,7 @@
                 return rtn;
             }.bind(this);
             this.options = __assign(__assign({}, this.options), options);
-            this.element.addEventListener('submit', function (e) {
+            this.element.addEventListener("submit", function (e) {
                 e.preventDefault();
                 e.stopImmediatePropagation();
                 this.submitForm();
@@ -407,16 +407,13 @@
             var tag = '[data-submit="#' + this.element.id + '"]';
             var submitButtons = $(tag);
             if (submitButtons) {
-                submitButtons.on('click', function (e) {
+                submitButtons.on("click", function (e) {
                     e.preventDefault();
                     e.stopImmediatePropagation();
-                    var exit = $(e.currentTarget).data('exit');
+                    var exit = $(e.currentTarget).data("exit");
                     if (exit) {
                         $(this.element).find("input#exit").remove();
-                        $("<input id='exit' />").attr("type", "hidden")
-                            .attr("name", "exit")
-                            .attr("value", "true")
-                            .appendTo(this.element);
+                        $("<input id='exit' />").attr("type", "hidden").attr("name", "exit").attr("value", "true").appendTo(this.element);
                     }
                     this.submitForm();
                 }.bind(this));
@@ -424,15 +421,14 @@
         }
         Validator.prototype.submitForm = function () {
             var _a;
-            this.element.classList.add('was-validated');
+            this.element.classList.add("was-validated");
             if (this.element.checkValidity()) {
-                this.element.classList.add('loading');
-                var checkboxes = this.element.querySelector('input[type=checkbox]');
+                this.element.classList.add("loading");
+                var checkboxes = this.element.querySelector("input[type=checkbox]");
                 if (checkboxes) {
-                    Array.prototype.slice.call(checkboxes)
-                        .forEach(function (checkbox) {
-                        if ($(this).is(':checked')) {
-                            $(this).val('true');
+                    Array.prototype.slice.call(checkboxes).forEach(function (checkbox) {
+                        if ($(this).is(":checked")) {
+                            $(this).val("true");
                         }
                     });
                 }
@@ -446,7 +442,10 @@
                             this.options.onComplete(data, this);
                         }
                     }.bind(this))
-                        .fail((_a = this.options.onError) !== null && _a !== void 0 ? _a : Inline.handleError);
+                        .fail((_a = this.options.onError) !== null && _a !== void 0 ? _a : Inline.handleError)
+                        .always(function () {
+                        this.element.classList.remove("loading");
+                    }.bind(this));
                 }
                 else {
                     this.element.submit();
@@ -1037,9 +1036,13 @@
     var PropertyService = /** @class */ (function () {
         function PropertyService(options) {
             this.options = {
-                listElementId: 'property-list',
-                mapListElementId: 'property-map-list',
-                mapElementId: 'property-map'
+                listElementId: "property-list",
+                mapListElementId: "property-map-list",
+                mapElementId: "property-map",
+                mapLocationListId: "property-map-locations",
+                renderPropertyPopup: function (location) {
+                    return "<div class=\"card border-0\" style=\"max-width:300px\">\n                        <div style=\"background-image:url(".concat(location.ImageUrl, ")\" class=\"rounded img-full img img-wide\"></div>\n                        <div class=\"card-body border-0\">\n                            <p style=\"overflow: hidden;text-overflow: ellipsis;white-space: nowrap;\">\n                                <strong>").concat(location.Address1, ", ").concat(location.Postcode, "</strong>\n                            </p>\n                            <p>").concat(location.Description, "</p>\n                            <a href=\"").concat(location.MarkerUrl, "\" class=\"btn btn-block btn-primary\">Find out more...</a>\n                        </div>\n                    </div>");
+                },
             };
             this.map = null;
             this.center = { lat: 30, lng: -110 };
@@ -1063,8 +1066,8 @@
                     if (this.options.onListRender) {
                         this.options.onListRender(data, sender);
                     }
-                    Alerts.log('Finished loading property list.', 'info');
-                }.bind(this)
+                    Alerts.log("Finished loading property list.", "info");
+                }.bind(this),
             });
         };
         PropertyService.prototype.initMapList = function () {
@@ -1078,9 +1081,9 @@
                     if (this.options.onMapLoad) {
                         this.options.onMapLoad(data, sender);
                     }
-                    Alerts.log('Finished loading map list.', 'info');
+                    Alerts.log("Finished loading map list.", "info");
                     this.reloadMarkers();
-                }.bind(this)
+                }.bind(this),
             });
         };
         PropertyService.prototype.initMap = function () {
@@ -1089,15 +1092,19 @@
                 return;
             }
             this.center = { lat: +this.mapElement.dataset.lat, lng: +this.mapElement.dataset.long };
+            var scrollwheel = false;
+            if (this.mapElement.dataset.scrollwheel === "true") {
+                scrollwheel = true;
+            }
             this.map = new google.maps.Map(this.mapElement, {
                 zoom: +this.mapElement.dataset.zoom || 15,
                 center: this.center,
-                scrollwheel: false
+                scrollwheel: scrollwheel,
             });
             $(window).resize(function () {
-                google.maps.event.trigger(this.map, 'resize');
+                google.maps.event.trigger(this.map, "resize");
             }.bind(this));
-            google.maps.event.trigger(this.map, 'resize');
+            google.maps.event.trigger(this.map, "resize");
             this.initMapList();
         };
         PropertyService.prototype.reloadMarkers = function () {
@@ -1112,23 +1119,27 @@
                 }
             }
             this.markers = [];
-            var locations = $("#property-map-locations").data('locations');
+            var locationsElement = document.getElementById(this.options.mapLocationListId);
+            if (!locationsElement) {
+                return;
+            }
+            var locations = JSON.parse(locationsElement.dataset.locations);
             locations.map(function (location, i) {
                 var marker = new google.maps.Marker({
                     position: new google.maps.LatLng(+location.Latitude, +location.Longitude),
                     map: this.map,
-                    optimized: true // makes SVG icons work in IE
+                    optimized: true, // makes SVG icons work in IE
                 });
                 if (this.mapElement.dataset.marker) {
                     marker.setIcon(this.mapElement.dataset.marker);
                 }
-                marker.info = "<div class=\"card border-0\" style=\"max-width:300px\">\n    <div style=\"background-image:url(".concat(location.ImageUrl, ")\" class=\"rounded img-full img img-wide\"></div>\n    <div class=\"card-body border-0\">\n        <p style=\"overflow: hidden;text-overflow: ellipsis;white-space: nowrap;\">\n            <strong>").concat(location.Address1, ", ").concat(location.Postcode, "</strong>\n        </p>\n        <p>").concat(location.Description, "</p>\n        <a href=\"").concat(location.MarkerUrl, "\" class=\"btn btn-block btn-primary\">Find out more...</a>\n    </div>\n</div>");
+                marker.info = this.options.renderPropertyPopup(location);
                 marker.addListener("click", function () {
                     if (infowindow) {
                         infowindow.close();
                     }
                     infowindow = new google.maps.InfoWindow({
-                        content: marker.info
+                        content: marker.info,
                     });
                     infowindow.open({
                         anchor: marker,