Tchanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/303103
Change subject: Fetch default options for gallery dialog
......................................................................
Fetch default options for gallery dialog
Fetch default options for mode, image heights and image widths
rather than hard-coding them.
Bug: T139632
Change-Id: I1adc7987fdeb1258ee87ce46acbab469ea18116e
---
M VisualEditor.hooks.php
M modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
2 files changed, 15 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/03/303103/1
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index f7c3e86..9b1a8e7 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -697,6 +697,7 @@
'defaultUserOptions' => [
'defaultthumbsize' => $thumbLimits[
$defaultUserOptions['thumbsize'] ]
],
+ 'galleryOptions' => $coreConfig->get( 'GalleryOptions'
),
'blacklist' => $veConfig->get(
'VisualEditorBrowserBlacklist' ),
'skins' => $veConfig->get( 'VisualEditorSupportedSkins'
),
'tabPosition' => $veConfig->get(
'VisualEditorTabPosition' ),
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
index 390b5f1..285a74e 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
@@ -252,7 +252,8 @@
caption, widths, heights, perrow,
showFilename, classes, styles,
dialog = this,
- attributes = this.selectedNode &&
this.selectedNode.getAttribute( 'mw' ).attrs;
+ attributes = this.selectedNode &&
this.selectedNode.getAttribute( 'mw' ).attrs,
+ defaults = mw.config.get(
'wgVisualEditorConfig' ).galleryOptions;
// Images card
@@ -307,10 +308,10 @@
// Options card
// Set options
- mode = attributes && attributes.mode || 'traditional';
+ mode = attributes && attributes.mode || defaults.mode;
caption = attributes && attributes.caption || '';
- widths = attributes && parseInt( attributes.widths ) ||
'';
- heights = attributes && parseInt( attributes.heights )
|| '';
+ widths = attributes && parseInt( attributes.widths ) ||
defaults.imageWidth;
+ heights = attributes && parseInt( attributes.heights )
|| defaults.imageHeight;
perrow = attributes && attributes.perrow || '';
showFilename = attributes && attributes.showfilename
=== 'yes';
classes = attributes && attributes.class || '';
@@ -589,9 +590,9 @@
var i, ilen, mode, caption, widths, heights, perrow,
showFilename, classes, styles,
selectedNode = this.selectedNode,
- oldMode = selectedNode && selectedNode.getAttribute( 'mw'
).attrs.mode,
extsrc = '',
- items = this.galleryGroup.items;
+ items = this.galleryGroup.items,
+ defaults = mw.config.get( 'wgVisualEditorConfig'
).galleryOptions;
// Parent method
ve.ui.MWGalleryDialog.super.prototype.updateMwData.call( this, mwData );
@@ -604,9 +605,6 @@
// Get data from options card
mode = this.modeDropdown.getMenu().getSelectedItem().getData();
- if ( oldMode === undefined && mode === 'traditional' ) {
- mode = undefined;
- }
caption = this.captionInput.getValue();
widths = this.widthsInput.getValue();
heights = this.heightsInput.getValue();
@@ -619,12 +617,17 @@
mwData.body.extsrc = extsrc + '\n';
mwData.attrs.mode = mode || undefined;
mwData.attrs.caption = caption || undefined;
- mwData.attrs.widths = widths ? widths + 'px' : undefined;
- mwData.attrs.heights = heights ? heights + 'px' : undefined;
+ mwData.attrs.widths = widths || undefined;
+ mwData.attrs.heights = heights || undefined;
mwData.attrs.perrow = perrow || undefined;
mwData.attrs.showfilename = showFilename ? 'yes' : undefined;
mwData.attrs.classes = classes || undefined;
mwData.attrs.styles = styles || undefined;
+
+ // Unset attributes with defaults if they are the same as the default
+ mwData.attrs.mode = mode === defaults.mode ? undefined : mode;
+ mwData.attrs.widths = widths === defaults.imageWidth.toString() ?
undefined : widths + 'px';
+ mwData.attrs.heights = heights === defaults.imageHeight.toString() ?
undefined : heights + 'px';
};
/* Registration */
--
To view, visit https://gerrit.wikimedia.org/r/303103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1adc7987fdeb1258ee87ce46acbab469ea18116e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tchanders <thalia.e.c...@googlemail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
