From: Tom Hughes <tom@compton.nu>
Date: Fri, 24 Feb 2017 23:10:12 +0000 (+0000)
Subject: Rename 'clickable' to 'interactive' per leaflet 1.x change
X-Git-Tag: live~4149
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/4b43396ede248f97560b059ef202c7fa26d63947?ds=sidebyside

Rename 'clickable' to 'interactive' per leaflet 1.x change
---

diff --git a/app/assets/javascripts/index/new_note.js b/app/assets/javascripts/index/new_note.js
index 53697e65b..54c0b0db1 100644
--- a/app/assets/javascripts/index/new_note.js
+++ b/app/assets/javascripts/index/new_note.js
@@ -69,7 +69,7 @@ OSM.NewNote = function(map) {
     var marker = L.marker(feature.geometry.coordinates.reverse(), {
       icon: noteIcons[feature.properties.status],
       opacity: 0.9,
-      clickable: true
+      interactive: true
     });
     marker.id = feature.properties.id;
     marker.addTo(noteLayer);
diff --git a/app/assets/javascripts/index/note.js b/app/assets/javascripts/index/note.js
index 5bf3f543a..3973420bd 100644
--- a/app/assets/javascripts/index/note.js
+++ b/app/assets/javascripts/index/note.js
@@ -87,7 +87,7 @@ OSM.Note = function (map) {
     currentNote = L.marker(latLng, {
       icon: noteIcons[data.status],
       opacity: 1,
-      clickable: true
+      interactive: true
     });
 
     map.addLayer(currentNote);
diff --git a/app/assets/javascripts/index/notes.js b/app/assets/javascripts/index/notes.js
index fd5cd3ae9..9feee888c 100644
--- a/app/assets/javascripts/index/notes.js
+++ b/app/assets/javascripts/index/notes.js
@@ -47,7 +47,7 @@ OSM.initializeNotes = function (map) {
         icon: noteIcons[feature.properties.status],
         title: feature.properties.comments[0].text,
         opacity: 0.8,
-        clickable: true
+        interactive: true
       });
       marker.id = feature.properties.id;
       marker.addTo(noteLayer);
diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 023e2a7f2..018aedf98 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -12,7 +12,7 @@ OSM.Query = function(map) {
     weight: 4,
     opacity: 1,
     fillOpacity: 0.5,
-    clickable: false
+    interactive: false
   };
 
   queryButton.on("click", function (e) {
diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index b87764b1d..e8df0bd61 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -209,7 +209,7 @@ L.OSM.Map = L.Map.extend({
       color: '#FF9500',
       opacity: 1,
       fillOpacity: 0,
-      clickable: false
+      interactive: false
     };
 
     this.removeObject();