wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Update initialHash after getting defaultDimensions in image model"

Browse source
This commit is contained in:
jenkins-bot 2014-10-23 20:00:20 +00:00 committed by Gerrit Code Review
parent 50e59f328a 14e1de1009
commit 7c8931f655
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/ve-mw/dm/models/ve.dm.MWImageModel.js
View file

@ -1056,13 +1056,20 @@ ve.dm.MWImageModel.prototype.attachScalable = function ( scalable ) {
} );
// Update media type
this.setMediaType( info.mediatype );
// Update according to type
ve.dm.MWImageNode.static.syncScalableToType(
this.getType(),
this.getMediaType(),
this.getScalable()
);
// We have to adjust the details in the initial hash if the original
// image was 'default' since we didn't have default until now and the
// default dimensions that were 'recorded' were wrong
if ( this.initialHash.scalable.isDefault ) {
this.initialHash.scalable.currentDimensions = this.scalable.getDefaultDimensions();
}
}, this ) );
}
};

7
modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
View file

@ -771,8 +771,11 @@ ve.ui.MWMediaDialog.prototype.attachImageModel = function () {
// Size widget
this.sizeErrorLabel.$element.hide();
this.sizeWidget.setScalable( this.imageModel.getScalable() );
this.sizeWidget.connect( this, { changeSizeType: 'checkChanged' } );
this.sizeWidget.connect( this, { change: 'checkChanged' } );
this.sizeWidget.connect( this, {
changeSizeType: 'checkChanged',
change: 'checkChanged',
valid: 'checkChanged'
} );
// Initialize size
this.sizeWidget.setSizeType(