jenkins-bot has submitted this change and it was merged.
Change subject: VE: Set 'align' attribute on mapframes
......................................................................
VE: Set 'align' attribute on mapframes
Bug: T144001
Change-Id: I1d10b3dc239da1fb90f82c4b20d7a9310528f194
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ve-maps/ve.ui.MWMaps.css
M modules/ve-maps/ve.ui.MWMapsDialog.js
5 files changed, 27 insertions(+), 1 deletion(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index b978281..0af590a 100644
--- a/extension.json
+++ b/extension.json
@@ -255,6 +255,7 @@
"modules/ve-maps/ve.ui.MWMaps.css"
],
"messages": [
+ "visualeditor-mwmapsdialog-align",
"visualeditor-mwmapsdialog-geojson",
"visualeditor-mwmapsdialog-reset-map",
"visualeditor-mwmapsdialog-size",
diff --git a/i18n/en.json b/i18n/en.json
index be99bc3..6249d19 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -71,6 +71,7 @@
"mapbox-control-zoomout-title": "Zoom out",
"kartographer-fullscreen-close": "Close",
"kartographer-fullscreen-text": "Show in full screen",
+ "visualeditor-mwmapsdialog-align": "Alignment",
"visualeditor-mwmapsdialog-geojson": "GeoJSON",
"visualeditor-mwmapsdialog-reset-map": "Reset map position",
"visualeditor-mwmapsdialog-size": "Size",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 34714cc..92b856c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -74,6 +74,7 @@
"mapbox-control-zoomout-title": "Title for map zoom out
button\n{{Identical|Zoom out}}",
"kartographer-fullscreen-close": "Title of the fullscreen close
button\n{{Identical|Close}}",
"kartographer-fullscreen-text": "Tooltip for a button that puts the map
into full screen",
+ "visualeditor-mwmapsdialog-align": "Label for setting the map's
alignment",
"visualeditor-mwmapsdialog-geojson": "{{optional}}\nLabel for map
GeoJSON data",
"visualeditor-mwmapsdialog-reset-map": "Label for resetting the map's
position",
"visualeditor-mwmapsdialog-size": "Label for map
size\n{{Identical|Size}}",
diff --git a/modules/ve-maps/ve.ui.MWMaps.css b/modules/ve-maps/ve.ui.MWMaps.css
index c271fba..e37c9d3 100644
--- a/modules/ve-maps/ve.ui.MWMaps.css
+++ b/modules/ve-maps/ve.ui.MWMaps.css
@@ -18,3 +18,10 @@
margin-bottom: 1em;
text-align: center;
}
+
+/* Fixes align=center */
+.ve-ce-mwMapsNode.center {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+}
diff --git a/modules/ve-maps/ve.ui.MWMapsDialog.js
b/modules/ve-maps/ve.ui.MWMapsDialog.js
index cec7dd1..fa6ee65 100644
--- a/modules/ve-maps/ve.ui.MWMapsDialog.js
+++ b/modules/ve-maps/ve.ui.MWMapsDialog.js
@@ -60,6 +60,10 @@
this.dimensions = new ve.ui.DimensionsWidget();
+ this.align = new ve.ui.AlignWidget( {
+ dir: this.getDir()
+ } );
+
this.input = new ve.ui.MWAceEditorWidget( {
multiline: true,
autosize: true,
@@ -84,6 +88,11 @@
label: ve.msg( 'visualeditor-mwmapsdialog-size' )
} );
+ this.alignField = new OO.ui.FieldLayout( this.align, {
+ align: 'right',
+ label: ve.msg( 'visualeditor-mwmapsdialog-align' )
+ } );
+
this.$resetMapButtonContainer = $( '<div>' ).addClass(
've-ui-mwMapsDialog-resetMapButton' );
this.geoJsonField = new OO.ui.FieldLayout( this.input, {
@@ -93,6 +102,7 @@
panel.$element.append(
this.dimensionsField.$element,
+ this.alignField.$element,
this.$mapContainer,
this.$resetMapButtonContainer.append(
this.resetMapButton.$element ),
this.geoJsonField.$element
@@ -212,6 +222,7 @@
if ( !( this.selectedNode instanceof ve.dm.MWInlineMapsNode ) ) {
mwData.attrs.width = dimensions.width.toString();
mwData.attrs.height = dimensions.height.toString();
+ mwData.attrs.align = this.align.getSelectedItem().getData();
}
};
@@ -232,7 +243,8 @@
data = data || {};
return ve.ui.MWMapsDialog.super.prototype.getSetupProcess.call( this,
data )
.next( function () {
- var inline = this.selectedNode instanceof
ve.dm.MWInlineMapsNode;
+ var inline = this.selectedNode instanceof
ve.dm.MWInlineMapsNode,
+ mwAttrs = this.selectedNode &&
this.selectedNode.getAttribute( 'mw' ).attrs || {};
this.input.clearUndoStack();
@@ -257,11 +269,15 @@
widthChange: 'onDimensionsChange',
heightChange: 'onDimensionsChange'
} );
+ this.align.connect( this, { choose: 'updateActions' } );
this.resetMapButton.connect( this, { click:
'resetMapPosition' } );
this.dimensionsField.toggle( !inline );
+ this.alignField.toggle( !inline );
+
// TODO: Support block/inline conversion
+ this.align.selectItemByData( mwAttrs.align || 'right' );
this.$resetMapButtonContainer.toggle(
!!this.selectedNode );
--
To view, visit https://gerrit.wikimedia.org/r/274446
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d10b3dc239da1fb90f82c4b20d7a9310528f194
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: JGirault <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
