From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 3 Aug 2022 10:47:08 +0000 (+0100)
Subject: Merge pull request #3631 from AntonKhorev/bootstrap-close
X-Git-Tag: live~2001
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/6b696558126fdeaefab37291a3bd26136c95fddb?hp=-c

Merge pull request #3631 from AntonKhorev/bootstrap-close

Use Bootstrap close button
---

6b696558126fdeaefab37291a3bd26136c95fddb
diff --combined app/assets/javascripts/index.js
index 6d379ca8c,d5a3731d8..40f546009
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@@ -195,7 -195,7 +195,7 @@@ $(document).ready(function () 
      $(".welcome").addClass("visible");
    }
  
-   $(".welcome .close").on("click", function () {
+   $(".welcome .btn-close").on("click", function () {
      $(".welcome").removeClass("visible");
      Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" });
    });
@@@ -203,7 -203,7 +203,7 @@@
    var bannerExpiry = new Date();
    bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
  
-   $("#banner .close-wrap").on("click", function (e) {
+   $("#banner .btn-close").on("click", function (e) {
      var cookieId = e.target.id;
      $("#banner").hide();
      e.preventDefault();
@@@ -212,13 -212,13 +212,13 @@@
      }
    });
  
 -  if (OSM.PIWIK) {
 +  if (OSM.MATOMO) {
      map.on("layeradd", function (e) {
        if (e.layer.options) {
 -        var goal = OSM.PIWIK.goals[e.layer.options.keyid];
 +        var goal = OSM.MATOMO.goals[e.layer.options.keyid];
  
          if (goal) {
 -          $("body").trigger("piwikgoal", goal);
 +          $("body").trigger("matomogoal", goal);
          }
        }
      });