jenkins-bot has submitted this change and it was merged. Change subject: Fix Leaflet problem with resource loader ......................................................................
Fix Leaflet problem with resource loader This is a partial re-submit of https://gerrit.wikimedia.org/r/#/c/49202/ Change by Pastakhov Change-Id: I08c3ddad4ca65faad9d610fcf75d38f15a511fb3 --- M includes/services/Leaflet/Leaflet.php M includes/services/Leaflet/Maps_Leaflet.php 2 files changed, 10 insertions(+), 5 deletions(-) Approvals: MathiasLidal: Looks good to me, but someone else must approve Jeroen De Dauw: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/services/Leaflet/Leaflet.php b/includes/services/Leaflet/Leaflet.php index 24f803b..4c53c99 100644 --- a/includes/services/Leaflet/Leaflet.php +++ b/includes/services/Leaflet/Leaflet.php @@ -34,13 +34,8 @@ 'remoteBasePath' => $egMapsScriptPath . '/includes/services/Leaflet', 'group' => 'ext.maps', 'scripts' => array( - 'leaflet/leaflet.js', 'jquery.leaflet.js', 'ext.maps.leaflet.js', - ), - 'styles' => array( - 'leaflet/leaflet.css', - 'leaflet/leaflet.ie.css', ), 'messages' => array( 'maps-markers', diff --git a/includes/services/Leaflet/Maps_Leaflet.php b/includes/services/Leaflet/Maps_Leaflet.php index 2b37469..58bb2d0 100644 --- a/includes/services/Leaflet/Maps_Leaflet.php +++ b/includes/services/Leaflet/Maps_Leaflet.php @@ -86,4 +86,14 @@ array( 'ext.maps.leaflet' ) ); } + + protected function getDependencies() { + $leafletPath = $GLOBALS['egMapsScriptPath'] . '/includes/services/Leaflet/leaflet'; + return array( + Html::linkedStyle( "$leafletPath/leaflet.css" ), + '<!--[if lte IE 8]>' . Html::linkedStyle( "$leafletPath/leaflet.ie.css" ). '<![endif]-->', + Html::linkedScript( "$leafletPath/leaflet.js" ), + ); + } + } -- To view, visit https://gerrit.wikimedia.org/r/85350 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I08c3ddad4ca65faad9d610fcf75d38f15a511fb3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Maps Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com> Gerrit-Reviewer: Daniel Werner <daniel.wer...@wikimedia.de> Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com> Gerrit-Reviewer: MathiasLidal <mathiasli...@gmail.com> Gerrit-Reviewer: Netbrain <k...@heldig.org> Gerrit-Reviewer: Nischayn22 <nischay...@gmail.com> Gerrit-Reviewer: Pastakhov <pastak...@yandex.ru> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
