Add event to get reference on drawcontrol

leaflet/static/leaflet/leaflet.forms.js

@@ -95,7 +95,7 @@ L.GeometryField = L.Class.extend({
         map.addLayer(this.drawnItems);
 
         // Initialize the draw control and pass it the FeatureGroup of editable layers
-        var drawControl = new L.Control.Draw(this._controlDrawOptions());
+        var drawControl = map.drawControl = new L.Control.Draw(this._controlDrawOptions());
 
         if (this.options.modifiable) {
             map.addControl(drawControl);
@@ -114,6 +114,8 @@ L.GeometryField = L.Class.extend({
         }
 
         this.load();
+
+        map.fire('map:loadfield', {field: this, fieldid: this.options.fieldid});
     },
 
     load: function () {

leaflet/tests/index.html

@@ -16,6 +16,8 @@
   <script src="../../node_modules/django-leaflet-tests/node_modules/leaflet/build/deps.js"></script>
   <script src="../../node_modules/django-leaflet-tests/node_modules/leaflet/debug/leaflet-include.js"></script>
 
+  <script src="../../leaflet/static/leaflet/draw/leaflet.draw.js"></script>
+
   <script src="../../leaflet/static/leaflet/leaflet.extras.js"></script>
   <script src="../../leaflet/static/leaflet/leaflet.forms.js"></script>
 

leaflet/tests/test.extras.js

@@ -37,7 +37,8 @@ describe('Test Leaflet Extras', function() {
     describe('L.Map.DjangoMap', function() {
 
         it("should not fail with minimal options", function(done) {
-            new L.Map.DjangoMap('map', {djoptions: {layers: []}});
+            var map = new L.Map.DjangoMap('map', {djoptions: {layers: []}});
+            map.remove();
             done();
         });
 

leaflet/tests/test.forms.js

@@ -26,5 +26,30 @@ describe('Test Leaflet Forms', function() {
             assert.isTrue(field.options.is_point);
             done();
         });
+
+        describe('Events', function () {
+
+            var map;
+
+            beforeEach(function () {
+                map = L.map('map').fitWorld();
+            });
+
+            afterEach(function () {
+                map.remove();
+            });
+
+            it("should emit event when field is loaded", function (done) {
+                var field = new L.GeometryField({geom_type: 'GEOMETRY', fieldid: 'formfield'});
+                map.on('map:loadfield', function (e) {
+                    assert.equal(e.target, map);
+                    assert.equal(e.field, field);
+                    assert.equal(e.fieldid, 'formfield');
+                    assert.isDefined(map.drawControl);
+                    done();
+                });
+                field.addTo(map);
+            });
+        });
     });
 });