JGirault has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317080
Change subject: Fix mapbox and other map scripts always loaded by VE
......................................................................
Fix mapbox and other map scripts always loaded by VE
Bug: T148511
Change-Id: I9268abdae5c0b5ad5d52e6cc4882e1f0fd608487
---
M extension.json
M modules/ve-maps/ve.ce.MWMapsNode.js
M modules/ve-maps/ve.ui.MWMapsDialog.js
3 files changed, 10 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer
refs/changes/80/317080/1
diff --git a/extension.json b/extension.json
index 2bfb185..7f70490 100644
--- a/extension.json
+++ b/extension.json
@@ -343,9 +343,7 @@
"jquery.throttle-debounce",
"oojs-ui.styles.icons-location",
"ext.visualEditor.mwcore",
- "ext.kartographer",
- "ext.kartographer.box",
- "ext.kartographer.editing"
+ "ext.kartographer"
],
"targets": [
"mobile",
diff --git a/modules/ve-maps/ve.ce.MWMapsNode.js
b/modules/ve-maps/ve.ce.MWMapsNode.js
index b96ee5d..65fd0e3 100644
--- a/modules/ve-maps/ve.ce.MWMapsNode.js
+++ b/modules/ve-maps/ve.ce.MWMapsNode.js
@@ -3,10 +3,6 @@
*
* @copyright 2011-2015 VisualEditor Team and others; see
http://ve.mit-license.org
*/
-/* globals require */
-var kartobox = require( 'ext.kartographer.box' ),
- kartoEditing = require( 'ext.kartographer.editing' );
-
/**
* ContentEditable paragraph node.
*
@@ -114,7 +110,10 @@
if ( requiresInteractive ) {
if ( !this.map && this.getRoot() ) {
- mw.loader.using( 'ext.kartographer.box' ).then(
this.setupMap.bind( this ) );
+ mw.loader.using( [
+ 'ext.kartographer.box',
+ 'ext.kartographer.editing'
+ ] ).then( this.setupMap.bind( this ) );
} else if ( this.map ) {
this.updateGeoJson();
this.updateMapPosition();
@@ -142,7 +141,7 @@
mwAttrs = mwData && mwData.attrs,
node = this;
- this.map = kartobox.map( {
+ this.map = mw.loader.require( 'ext.kartographer.box' ).map( {
container: this.$element[ 0 ],
center: [ +mwAttrs.latitude, +mwAttrs.longitude ],
zoom: +mwAttrs.zoom
@@ -169,7 +168,7 @@
geoJson = mwData && mwData.body.extsrc;
if ( geoJson !== this.geoJson ) {
- kartoEditing.updateKartographerLayer( this.map, mwData &&
mwData.body.extsrc ).then( this.updateMapPosition.bind( this ) );
+ mw.loader.require( 'ext.kartographer.editing'
).updateKartographerLayer( this.map, mwData && mwData.body.extsrc ).then(
this.updateMapPosition.bind( this ) );
this.geoJson = geoJson;
}
};
diff --git a/modules/ve-maps/ve.ui.MWMapsDialog.js
b/modules/ve-maps/ve.ui.MWMapsDialog.js
index ba86943..fd01561 100644
--- a/modules/ve-maps/ve.ui.MWMapsDialog.js
+++ b/modules/ve-maps/ve.ui.MWMapsDialog.js
@@ -4,10 +4,6 @@
* @copyright 2011-2015 VisualEditor Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
-/* globals require */
-var kartobox = require( 'ext.kartographer.box' ),
- kartoEditing = require( 'ext.kartographer.editing' );
-
/**
* Dialog for editing MW maps.
*
@@ -323,7 +319,7 @@
mapPosition = dialog.getInitialMapPosition();
// TODO: Support 'style' editing
- dialog.map = kartobox.map( {
+ dialog.map = mw.loader.require( 'ext.kartographer.box' ).map( {
container: dialog.$map[ 0 ],
center: mapPosition.center,
zoom: mapPosition.zoom,
@@ -351,7 +347,7 @@
} );
}
- geoJsonLayer = kartoEditing.getKartographerLayer(
dialog.map );
+ geoJsonLayer = mw.loader.require(
'ext.kartographer.editing' ).getKartographerLayer( dialog.map );
drawControl = new L.Control.Draw( {
edit: { featureGroup: geoJsonLayer },
draw: {
@@ -445,7 +441,7 @@
return;
}
- kartoEditing.updateKartographerLayer( this.map, this.input.getValue() )
+ mw.loader.require( 'ext.kartographer.editing'
).updateKartographerLayer( this.map, this.input.getValue() )
.done( function () {
self.input.setValidityFlag( true );
} )
--
To view, visit https://gerrit.wikimedia.org/r/317080
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9268abdae5c0b5ad5d52e6cc4882e1f0fd608487
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: JGirault <julien.inbox.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
