Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/274419
Change subject: Removed 'mode' from Maps VE editor
......................................................................
Removed 'mode' from Maps VE editor
Bug: T128599
Change-Id: I018d343b7ce7907362a8e057551d0f039a11d5ad
---
M i18n/en.json
M i18n/qqq.json
M modules/ve-maps/ve.ui.MWMapsDialog.js
3 files changed, 16 insertions(+), 87 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer
refs/changes/19/274419/1
diff --git a/i18n/en.json b/i18n/en.json
index 361506d..9190c51 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -50,11 +50,6 @@
"mapbox-control-zoomin-title": "Zoom in",
"mapbox-control-zoomout-title": "Zoom out",
"visualeditor-mwmapsdialog-geojson": "GeoJSON",
- "visualeditor-mwmapsdialog-mode": "Mode",
- "visualeditor-mwmapsdialog-mode-data": "Data",
- "visualeditor-mwmapsdialog-mode-interactive": "Interactive",
- "visualeditor-mwmapsdialog-mode-link": "Link",
- "visualeditor-mwmapsdialog-mode-static": "Static",
"visualeditor-mwmapsdialog-size": "Size",
"visualeditor-mwmapsdialog-title": "Map"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a5d986e..66e4076 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -52,11 +52,6 @@
"mapbox-control-zoomin-title": "Title for map zoom in
button\n{{Identical|Zoom in}}",
"mapbox-control-zoomout-title": "Title for map zoom out
button\n{{Identical|Zoom out}}",
"visualeditor-mwmapsdialog-geojson": "{{optional}}\nLabel for map
GeoJSON data",
- "visualeditor-mwmapsdialog-mode": "Label for map rendering
mode\n{{Identical|Mode}}",
- "visualeditor-mwmapsdialog-mode-data": "Label for data-only map
rendering\n{{Identical|Data}}",
- "visualeditor-mwmapsdialog-mode-interactive": "Label for interactive
map rendering\n{{Identical|Interactive}}",
- "visualeditor-mwmapsdialog-mode-link": "Label for link map
rendering\n{{Identical|Link}}",
- "visualeditor-mwmapsdialog-mode-static": "Label for static map
rendering\n{{Identical|Static}}",
"visualeditor-mwmapsdialog-size": "Label for map
size\n{{Identical|Size}}",
"visualeditor-mwmapsdialog-title": "Title of the map
dialog\n{{Identical|Map}}"
}
diff --git a/modules/ve-maps/ve.ui.MWMapsDialog.js
b/modules/ve-maps/ve.ui.MWMapsDialog.js
index 30dd478..eb6f721 100644
--- a/modules/ve-maps/ve.ui.MWMapsDialog.js
+++ b/modules/ve-maps/ve.ui.MWMapsDialog.js
@@ -39,7 +39,7 @@
* @inheritdoc
*/
ve.ui.MWMapsDialog.prototype.initialize = function () {
- var panel, modeField;
+ var panel;
// Parent method
ve.ui.MWMapsDialog.super.prototype.initialize.call( this );
@@ -52,13 +52,6 @@
this.updatingGeoJson = false;
this.dimensions = new ve.ui.DimensionsWidget();
-
- this.modeSelect = new OO.ui.ButtonSelectWidget().addItems( [
- new OO.ui.ButtonOptionWidget( { data: 'interactive', label:
ve.msg( 'visualeditor-mwmapsdialog-mode-interactive' ) } ),
- new OO.ui.ButtonOptionWidget( { data: 'static', label: ve.msg(
'visualeditor-mwmapsdialog-mode-static' ) } ),
- new OO.ui.ButtonOptionWidget( { data: 'link', label: ve.msg(
'visualeditor-mwmapsdialog-mode-link' ) } ),
- new OO.ui.ButtonOptionWidget( { data: 'data', label: ve.msg(
'visualeditor-mwmapsdialog-mode-data' ) } )
- ] );
this.input = new ve.ui.MWAceEditorWidget( {
multiline: true,
@@ -79,7 +72,6 @@
widthChange: 'onDimensionsChange',
heightChange: 'onDimensionsChange'
} );
- this.modeSelect.connect( this, { select: 'onModeSelectSelect' } );
panel = new OO.ui.PanelLayout( {
padded: true,
@@ -91,17 +83,12 @@
label: ve.msg( 'visualeditor-mwmapsdialog-size' )
} );
- modeField = new OO.ui.FieldLayout( this.modeSelect, {
- align: 'right',
- label: ve.msg( 'visualeditor-mwmapsdialog-mode' )
- } );
-
this.geoJsonField = new OO.ui.FieldLayout( this.input, {
align: 'top',
label: ve.msg( 'visualeditor-mwmapsdialog-geojson' )
} );
- panel.$element.append( this.dimensionsField.$element,
modeField.$element, this.$mapContainer, this.geoJsonField.$element );
+ panel.$element.append( this.dimensionsField.$element,
this.$mapContainer, this.geoJsonField.$element );
this.$body.append( panel.$element );
};
@@ -132,30 +119,10 @@
};
/**
- * Handle select events on the mode select widget
- *
- * @param {OO.ui.OptionWidget|null} item Selected item
- */
-ve.ui.MWMapsDialog.prototype.onModeSelectSelect = function ( item ) {
- var mode = item && item.getData();
-
- this.geoJsonField.toggle( mode !== 'static' );
- this.dimensionsField.toggle( mode !== 'data' );
- this.$mapContainer.toggleClass( 'oo-ui-element-hidden', mode === 'data'
);
-
- this.updateSize();
-
- if ( mode !== 'data' ) {
- this.setupMap();
- }
-};
-
-/**
* @inheritdoc ve.ui.MWExtensionWindow
*/
ve.ui.MWMapsDialog.prototype.updateMwData = function ( mwData ) {
var center, latitude, longitude, zoom,
- mode = this.modeSelect.getSelectedItem().getData(),
dimensions = this.scalable.getBoundedDimensions(
this.dimensions.getDimensions()
);
@@ -163,30 +130,20 @@
// Parent method
ve.ui.MWMapsDialog.super.prototype.updateMwData.call( this, mwData );
- if ( mode !== 'data' ) {
- if ( this.map ) {
- center = this.map.getCenter();
- latitude = center.lat;
- longitude = center.lng;
- zoom = this.map.getZoom();
- } else {
- // Map not loaded in insert, can't insert
- return;
- }
- mwData.attrs.latitude = latitude.toString();
- mwData.attrs.longitude = longitude.toString();
- mwData.attrs.zoom = zoom.toString();
- mwData.attrs.width = dimensions.width.toString();
- mwData.attrs.height = dimensions.height.toString();
+ if ( this.map ) {
+ center = this.map.getCenter();
+ latitude = center.lat;
+ longitude = center.lng;
+ zoom = this.map.getZoom();
} else {
- delete mwData.attrs.latitude;
- delete mwData.attrs.longitude;
- delete mwData.attrs.zoom;
- delete mwData.attrs.width;
- delete mwData.attrs.height;
+ // Map not loaded in insert, can't insert
+ return;
}
-
- mwData.attrs.mode = mode;
+ mwData.attrs.latitude = latitude.toString();
+ mwData.attrs.longitude = longitude.toString();
+ mwData.attrs.zoom = zoom.toString();
+ mwData.attrs.width = dimensions.width.toString();
+ mwData.attrs.height = dimensions.height.toString();
};
/**
@@ -195,12 +152,7 @@
ve.ui.MWMapsDialog.prototype.getReadyProcess = function ( data ) {
return ve.ui.MWMapsDialog.super.prototype.getReadyProcess.call( this,
data )
.next( function () {
- var attributes = this.selectedNode &&
this.selectedNode.getAttribute( 'mw' ).attrs,
- mode = attributes && attributes.mode ||
'interactive';
-
- if ( mode !== 'data' ) {
- this.setupMap();
- }
+ this.setupMap();
}, this );
};
@@ -211,32 +163,19 @@
data = data || {};
return ve.ui.MWMapsDialog.super.prototype.getSetupProcess.call( this,
data )
.next( function () {
- var attributes = this.selectedNode &&
this.selectedNode.getAttribute( 'mw' ).attrs,
- mode = attributes && attributes.mode ||
'interactive',
- isInline = this.selectedNode instanceof
ve.dm.MWInlineMapsNode;
+ var isInline = this.selectedNode instanceof
ve.dm.MWInlineMapsNode;
this.input.clearUndoStack();
-
- this.modeSelect.selectItemByData( mode );
this.actions.setMode( this.selectedNode ? 'edit' :
'insert' );
if ( this.selectedNode instanceof ve.dm.MWMapsNode ) {
this.scalable = this.selectedNode.getScalable();
- } else if ( this.selectedNode && mode === 'link' ) {
- this.scalable =
ve.dm.MWMapsNode.static.createScalable( {
- width: this.selectedNode.getAttribute(
'width' ),
- height: this.selectedNode.getAttribute(
'height' )
- } );
} else {
this.scalable =
ve.dm.MWMapsNode.static.createScalable( { width: 400, height: 300 } );
}
// TODO: Support block/inline conversion
- this.modeSelect.getItemFromData( 'interactive'
).toggle( !isInline );
- this.modeSelect.getItemFromData( 'static' ).toggle(
!isInline );
- this.modeSelect.getItemFromData( 'link' ).toggle(
isInline );
- this.modeSelect.getItemFromData( 'data' ).toggle(
isInline );
this.dimensions.setDimensions(
this.scalable.getCurrentDimensions() );
}, this );
--
To view, visit https://gerrit.wikimedia.org/r/274419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I018d343b7ce7907362a8e057551d0f039a11d5ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Yurik <yu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
