jenkins-bot has submitted this change and it was merged.
Change subject: Disable geojson double-sanitization
......................................................................
Disable geojson double-sanitization
Disable mapbox's internal sanitization
after geojson has passed through the MW sanitizer.
Bug: T129189
Change-Id: Ic244ea0253b9980303fc02da3260a48496f4a7ef
---
M modules/kartographer.js
1 file changed, 9 insertions(+), 1 deletion(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/kartographer.js b/modules/kartographer.js
index a0eb7b7..61219ed 100644
--- a/modules/kartographer.js
+++ b/modules/kartographer.js
@@ -115,6 +115,14 @@
return map;
};
+ mw.kartographer.dataLayerOpts = {
+ // Disable double-sanitization by mapbox's internal sanitizer
+ // because geojson has already passed through the MW internal
sanitizer
+ sanitizer: function ( v ) {
+ return v;
+ }
+ };
+
/**
* Create a new GeoJSON layer and add it to map.
*
@@ -123,7 +131,7 @@
*/
mw.kartographer.addDataLayer = function ( map, geoJson ) {
try {
- return L.mapbox.featureLayer( geoJson ).addTo( map );
+ return L.mapbox.featureLayer( geoJson,
mw.kartographer.dataLayerOpts ).addTo( map );
} catch ( e ) {
mw.log( e );
}
--
To view, visit https://gerrit.wikimedia.org/r/275732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic244ea0253b9980303fc02da3260a48496f4a7ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: wmf/1.27.0-wmf.15
Gerrit-Owner: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: Yurik <yu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
