Rename 'clickable' to 'interactive' per leaflet 1.x change
authorTom Hughes <tom@compton.nu>
Fri, 24 Feb 2017 23:10:12 +0000 (23:10 +0000)
committerTom Hughes <tom@compton.nu>
Fri, 24 Feb 2017 23:10:12 +0000 (23:10 +0000)
app/assets/javascripts/index/new_note.js
app/assets/javascripts/index/note.js
app/assets/javascripts/index/notes.js
app/assets/javascripts/index/query.js
app/assets/javascripts/leaflet.map.js

index 53697e65b584d20686d3ee9bf3d200878fb9fac2..54c0b0db150ff25bb2c36a02b540b55cf612ba83 100644 (file)
@@ -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);
index 5bf3f543a3ed4cde9fddcd043eaa7da861195467..3973420bdd3d3536682aa0b87b6720c65b7e9874 100644 (file)
@@ -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);
index fd5cd3ae9288ad8ffed7e79d557a44242a0a9ae4..9feee888c1daca1820ad5cb3baee03b6f30c27e8 100644 (file)
@@ -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);
index 023e2a7f22069bba02babd5542246f0e711f0228..018aedf98a01df4c5bc3a4996611b9596edbd386 100644 (file)
@@ -12,7 +12,7 @@ OSM.Query = function(map) {
     weight: 4,
     opacity: 1,
     fillOpacity: 0.5,
-    clickable: false
+    interactive: false
   };
 
   queryButton.on("click", function (e) {
index b87764b1d06a759dc171cdda62bdc25ef9a48e39..e8df0bd618ebfd1c64dead46e932843a19ca9769 100644 (file)
@@ -209,7 +209,7 @@ L.OSM.Map = L.Map.extend({
       color: '#FF9500',
       opacity: 1,
       fillOpacity: 0,
-      clickable: false
+      interactive: false
     };
 
     this.removeObject();