Updated to work with Leaflet 1.4.0

Merge pull request #14 from mpuputti/patch-1
vogdb · Aug 8, 2021 · f857b74 · f857b74
2 parents 90ce9d4 + 2f00271
commit f857b74
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 32 deletions.
diff --git a/bower.json b/bower.json
diff --git a/dist/leaflet.active-layers.min.js b/dist/leaflet.active-layers.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "leaflet.active-layers",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "A plugin for the Leaflet library. This plugin adds new L.Control.ActiveLayers with functionality to get currently active layers on the map.",
     "repository": {
         "type": "git",
@@ -14,7 +14,7 @@
         }
     ],
     "dependencies": {
-      "leaflet": "~0.7"
+      "leaflet": ">0.7"
     },
     "devDependencies": {
         "grunt-contrib-watch": "~0.3.1",

diff --git a/src/ActiveLayers.js b/src/ActiveLayers.js
@@ -1,6 +1,6 @@
 /**
  * Created: vogdb Date: 5/4/13 Time: 1:54 PM
- * Version: 0.3.0
+ * Version: 0.3.1
  */
 
 L.Control.ActiveLayers = L.Control.Layers.extend({
@@ -104,9 +104,14 @@ L.Control.ActiveLayers = L.Control.Layers.extend({
   },
 
   _recountLayers: function () {
-    var i, input, obj,
-      inputs = this._form.getElementsByTagName('input'),
-      inputsLen = inputs.length;
+    var i, input, obj, inputs, inputsLen
+    if (this.hasOwnProperty('_section')) {
+      inputs = this._section.getElementsByTagName('input')
+    } else {
+      // Up until version 1.3.6, Leaflet used _form.
+      inputs = this._form.getElementsByTagName('input')
+    }
+    inputsLen = inputs.length;
 
     for (i = 0; i < inputsLen; i++) {
       input = inputs[i]