Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/115820
Change subject: Default/custom switch size quickfix
......................................................................
Default/custom switch size quickfix
Handling a bug where the placeholders weren't set to images that weren't
set to default size. The switch to 'default' failed because there were
no placeholders and data for default to go on. This is now fixed in this
commit; if the image is non-default, the values are given to the media
size widget from the config settings.
Change-Id: I402b8d4de606c0939daa316408fcf5de2f0b2181
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
1 file changed, 17 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/20/115820/1
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index 98c4944..5d16c4b 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -372,8 +372,8 @@
if ( this.sizeSelectWidget.getSelectedItem().getData() === 'default' ) {
// Reset so placeholders appear
this.sizeWidget.setCurrentDimensions( {
- 'width': 0,
- 'height': 0
+ 'width': '',
+ 'height': ''
} );
} else {
// Fill the values as actual values into the size widget
@@ -387,7 +387,7 @@
* @inheritdoc
*/
ve.ui.MWMediaEditDialog.prototype.setup = function ( data ) {
- var newDoc,
+ var newDoc, defaultBoundingBox,
dialog = this,
doc = this.surface.getModel().getDocument(),
mediaNodeView = this.surface.getView().getFocusedNode();
@@ -523,6 +523,20 @@
'height': 0
} );
} else {
+ // Set placeholders for the default bounding box
+ defaultBoundingBox = mw.config.get( 'wgVisualEditorConfig' )
+ .defaultUserOptions.defaultthumbsize;
+
+ if ( this.mediaNode.getAttribute( 'width' ) >
this.mediaNode.getAttribute( 'height' ) ) {
+ this.sizeWidget.setPlaceholderDimensions( {
+ 'width': defaultBoundingBox,
+ } );
+ } else {
+ this.sizeWidget.setPlaceholderDimensions( {
+ 'height': defaultBoundingBox
+ } );
+ }
+
this.sizeSelectWidget.intializeSelection(
this.sizeSelectWidget.getItemFromData( 'custom' )
);
--
To view, visit https://gerrit.wikimedia.org/r/115820
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I402b8d4de606c0939daa316408fcf5de2f0b2181
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <mor...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
