Merge pull request #386 from SylvainCorlay/after-attach

Trigger after-attach phosphor event in WidgetControl

Author: SylvainCorlay

js/package-lock.json

@@ -4,6 +4,8 @@ var L = require('../leaflet.js');
 var control = require('./Control.js');
 var LeafletControlView = control.LeafletControlView;
 var LeafletControlModel = control.LeafletControlModel;
+var PMessaging = require('@phosphor/messaging');
+var PWidgets = require('@phosphor/widgets');
 
 L.Control.WidgetControl = L.Control.extend({
     updateLayout: function(options) {
@@ -14,12 +16,15 @@ L.Control.WidgetControl = L.Control.extend({
         });
     },
 
-    getContent: function(){
+    getContent: function() {
         return this._content;
     },
 
-    setContent: function(content){
-        if (!this._map) { return; }
+    setContent: function(content) {
+        if (!this._map)
+        {
+            return;
+        }
 
         this._content = content;
         this._container.appendChild(this._content);
@@ -80,6 +85,7 @@ var LeafletWidgetControlView = LeafletControlView.extend({
                     this.widget_view.displayed.then(() => {
                         this.updateLayout();
                         this.obj.setContent(view.el);
+                        PMessaging.MessageLoop.sendMessage(view.pWidget, PWidgets.Widget.Msg.AfterAttach);
                     });
                 });
             })

js/src/controls/WidgetControl.js

@@ -14,7 +14,7 @@ var LeafletLayerGroupModel = LeafletLayerModel.extend({
 }, {
     serializers: _.extend({
         layers: { deserialize: widgets.unpack_models }
-    }, widgets.DOMWidgetModel.serializers)
+    }, widgets.WidgetModel.serializers)
 });
 
 var LeafletLayerGroupView = LeafletLayerView.extend({

js/src/layers/LayerGroup.js

@@ -14,7 +14,7 @@ var LeafletMarkerClusterModel = LeafletLayerModel.extend({
 }, {
     serializers: _.extend({
         markers: { deserialize: widgets.unpack_models }
-    }, widgets.DOMWidgetModel.serializers)
+    }, widgets.WidgetModel.serializers)
 });
 
 var LeafletMarkerClusterView = layer.LeafletLayerView.extend({