[MediaWiki-commits] [Gerrit] Only call setOriginalDimensions when non-null values are pro... - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Only call setOriginalDimensions when non-null values are 
provided
......................................................................


Only call setOriginalDimensions when non-null values are provided

Otherwise the button is never disabled.

Also assume that dimensions objects are always just width/height
as specified in the documentation.

Change-Id: I9530ed4257e88b90d4073b9d21d7a7490aa16f7b
---
M modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
1 file changed, 12 insertions(+), 12 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js 
b/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
index 8c01c49..505742f 100644
--- a/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
+++ b/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
@@ -35,8 +35,8 @@
 
        this.width = config.width || '';
        this.height = config.height || '';
-       this.originalDimensions = config.originalDimensions || {};
-       this.maxDimensions = config.maxDimensions || {};
+       this.originalDimensions = null;
+       this.maxDimensions = null;
 
        // Cache for the aspect ratio, which is set by setOriginalDimensions()
        this.aspectRatio = null;
@@ -107,8 +107,12 @@
 
        // Initialization
        this.$element.addClass( 've-ui-mediaSizeWidget' );
-       this.setOriginalDimensions( this.originalDimensions );
-       this.setMaxDimensions( this.maxDimensions );
+       if ( config.originalDimensions ) {
+               this.setOriginalDimensions( config.originalDimensions );
+       }
+       if ( config.maxDimensions ) {
+               this.setMaxDimensions( config.maxDimensions );
+       }
 };
 
 /* Inheritance */
@@ -217,10 +221,7 @@
  * @param {number} [dimensions.height] Maximum height
  */
 ve.ui.MediaSizeWidget.prototype.setMaxDimensions = function ( dimensions ) {
-       this.maxDimensions = {
-               'width': dimensions.width,
-               'height': dimensions.height
-       };
+       this.maxDimensions = ve.copy( dimensions );
 };
 
 /**
@@ -240,10 +241,7 @@
  * @param {number} dimensions.height Original height
  */
 ve.ui.MediaSizeWidget.prototype.setOriginalDimensions = function ( dimensions 
) {
-       this.originalDimensions = {
-               'width': dimensions.width,
-               'height': dimensions.height
-       };
+       this.originalDimensions = ve.copy( dimensions );
        // Cache the aspect ratio
        this.aspectRatio = this.originalDimensions.width / 
this.originalDimensions.height;
        // Enable the 'original dimensions' button
@@ -285,9 +283,11 @@
                // TODO use a separate error message for this case,
                // and put the max dimensions in the error message
                (
+                       this.maxDimensions &&
                        $.isNumeric( this.maxDimensions.width ) &&
                        Number( this.width ) > this.maxDimensions.width
                ) || (
+                       this.maxDimensions &&
                        $.isNumeric( this.maxDimensions.height ) &&
                        Number( this.height ) > this.maxDimensions.height
                )

-- 
To view, visit https://gerrit.wikimedia.org/r/109520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9530ed4257e88b90d4073b9d21d7a7490aa16f7b
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Mooeypoo <mor...@gmail.com>
Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits