Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118427
Change subject: Fix regression bug 'default size' change on alignment
......................................................................
Fix regression bug 'default size' change on alignment
* Corrected the condition that set default size only if the image
wasn't smaller than the default.
* Added a couple of sanity check conditions for the OO.Compare
condition
Bug: 62586
Bug: 62581
Change-Id: I4db996cec33ac9d53ef485b53568100e3912c4ae
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
1 file changed, 13 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/27/118427/1
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index 0711073..1d20a0d 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -353,6 +353,10 @@
this.sizeSelectWidget.selectItem(
this.sizeSelectWidget.getItemFromData(
thumbOrFrameless &&
+ // Sanity check just in case before the
comparison
+ this.sizeWidget.getCurrentDimensions() &&
+ // Make sure there are original dimensions set
up
+ this.sizeWidget.getOriginalDimensions() &&
OO.compare(
this.sizeWidget.getCurrentDimensions(),
this.sizeWidget.getOriginalDimensions()
@@ -378,24 +382,24 @@
* @param {OO.ui.ButtonOptionWidget} item Selected item
*/
ve.ui.MWMediaEditDialog.prototype.onTypeChange = function ( item ) {
- var selectedType = item ? item.getData() : '',
+ var originalDimensions = this.sizeWidget.getOriginalDimensions(),
+ selectedType = item ? item.getData() : '',
thumbOrFrameless = selectedType === 'thumb' || selectedType ===
'frameless';
// As per wikitext docs, both 'thumb' and 'frameless' have
// explicitly limited size, as opposed to the similar case
// of having no type specified
if ( thumbOrFrameless ) {
-
// Set the placeholders to be wiki default, but only if the
image
// is not smaller. Limit on width only (according to wikitext
default)
- if ( this.mediaNode.getAttribute( 'width' ) >
this.defaultThumbSize ) {
+ if ( originalDimensions.width > this.defaultThumbSize ) {
this.sizeWidget.setPlaceholderDimensions( {
'width': this.defaultThumbSize,
} );
} else {
// The image is smaller than wiki default. Make the
default dimensions
// the image max size
- this.sizeWidget.setPlaceholderDimensions(
this.sizeWidget.getOriginalDimensions() );
+ this.sizeWidget.setPlaceholderDimensions(
originalDimensions );
}
// Enable the size select widget 'default' option
@@ -408,9 +412,7 @@
// Technically, this is the 'default' of non thumb/frameless
// images, as that is the size that they render in when
// no size is specified.
- this.sizeWidget.setPlaceholderDimensions(
- this.sizeWidget.getOriginalDimensions()
- );
+ this.sizeWidget.setPlaceholderDimensions( originalDimensions );
// Don't allow for 'default' choice
this.sizeSelectWidget.getItemFromData( 'default' ).setDisabled(
true );
@@ -443,6 +445,10 @@
// thumbnail or frameless
if (
thumbOrFrameless &&
+ // Sanity check just in case before the comparison
+ this.sizeWidget.getCurrentDimensions() &&
+ // Make sure there are original dimensions set up
+ this.sizeWidget.getOriginalDimensions() &&
OO.compare(
this.sizeWidget.getCurrentDimensions(),
this.sizeWidget.getOriginalDimensions()
--
To view, visit https://gerrit.wikimedia.org/r/118427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4db996cec33ac9d53ef485b53568100e3912c4ae
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
