Fixed cluster regression. Geezes fuck leaflet

ProfessionalWiki · Dec 28, 2019 · 269b51e · 269b51e
1 parent 1edbc97
commit 269b51e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -6,6 +6,7 @@ different releases and which versions of PHP and MediaWiki they support, see the
 ## Maps 7.15.4
 
 * Dark Leaflet layers are no longer shown (7.10.0 revert)
+* Fixed recent Leaflet cluster regression
 
 ## Maps 7.15.3
 

diff --git a/resources/leaflet/jquery.leaflet.js b/resources/leaflet/jquery.leaflet.js
@@ -44,28 +44,38 @@
 		_this.options = options; // needed by LeafletAjax.js
 
 		this.setup = function() {
-			this.doSetup();
-		};
-
-		this.doSetup = function() {
 			this.map = L.map( this.get(0), getMapOptions(options) );
 			this.mapContent = maps.leaflet.FeatureBuilder.contentLayerFromOptions(options);
 
+			this.ranSetup = false;
+
 			this.mapContent.on('add', function(e) {
-				_this.centerAndZoomMap();
+				_this.doSetup();
 			});
 
 			this.mapContent.addTo(this.map);
-			this.map.fitWorld();
 
-			this.hideLoadingMessage();
-			this.addZoomControl();
-			this.addLayersAndOverlays();
-			this.bindClickTarget();
-			this.applyResizable();
-			this.bindAjaxEvents();
+			// For whatever reason the add event does not fire when using marker cluster, hence this fallback.
+			setTimeout(function() {
+				_this.doSetup();
+			},250);
+		};
+
+		this.doSetup = function() {
+			if (!this.ranSetup) {
+				this.ranSetup = true;
 
-			this.maybeAddEditButton();
+				this.hideLoadingMessage();
+				this.addZoomControl();
+				this.addLayersAndOverlays();
+				this.map.fitWorld();
+				this.centerAndZoomMap();
+				this.bindClickTarget();
+				this.applyResizable();
+				this.bindAjaxEvents();
+
+				this.maybeAddEditButton();
+			}
 		};
 
 		this.addZoomControl = function() {