put sourcedata listener back in

mapbox · Jan 11, 2018 · 942753d · 942753d
1 parent a3a47b1
commit 942753d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/ui/control/attribution_control.js b/src/ui/control/attribution_control.js
@@ -54,6 +54,7 @@ class AttributionControl {
         this._updateEditLink();
 
         this._map.on('styledata', this._updateData);
+        this._map.on('sourcedata', this._updateData);
         this._map.on('moveend', this._updateEditLink);
 
         if (compact === undefined) {
@@ -67,6 +68,7 @@ class AttributionControl {
     onRemove() {
         DOM.remove(this._container);
 
+        this._map.off('styledata', this._updateData);
         this._map.off('sourcedata', this._updateData);
         this._map.off('moveend', this._updateEditLink);
         this._map.off('resize', this._updateCompact);
@@ -97,9 +99,11 @@ class AttributionControl {
         }
     }
 
-    _updateData() {
-        this._updateAttributions();
-        this._updateEditLink();
+    _updateData(e) {
+        if (e && (e.type === "styledata" || e.sourceDataType === "metadata")) {
+            this._updateAttributions();
+            this._updateEditLink();
+        }
     }
 
     _updateAttributions() {

diff --git a/src/ui/control/logo_control.js b/src/ui/control/logo_control.js
@@ -33,21 +33,23 @@ class LogoControl {
         this._container.style.display = 'none';
 
         this._map.on('styledata', this._updateLogo);
+        this._map.on('sourcedata', this._updateLogo);
         this._updateLogo();
         return this._container;
     }
 
     onRemove() {
         DOM.remove(this._container);
+        this._map.off('styledata', this._updateLogo);
         this._map.off('sourcedata', this._updateLogo);
     }
 
     getDefaultPosition() {
         return 'bottom-left';
     }
 
-    _updateLogo() {
-        this._container.style.display = this._logoRequired() ? 'block' : 'none';
+    _updateLogo(e) {
+        if (e && (e.type === 'styledata' || e.sourceDataType === "metadata")) this._container.style.display = this._logoRequired() ? 'block' : 'none';
     }
 
     _logoRequired() {