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

Merge "Don't try to set dimensions on an error image"

Browse source
This commit is contained in:
jenkins-bot 2019-02-15 19:01:32 +00:00 committed by Gerrit Code Review
parent 28d4815fa8 e95ec4e24f
commit 81c16f6b8a
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
View file

@ -155,11 +155,16 @@ ve.ce.MWBlockImageNode.prototype.updateClasses = function ( oldAlign ) {
* @param {Object} [dimensions] Dimension object containing width & height * @param {Object} [dimensions] Dimension object containing width & height
*/ */
ve.ce.MWBlockImageNode.prototype.updateSize = function ( dimensions ) { ve.ce.MWBlockImageNode.prototype.updateSize = function ( dimensions ) {
var var isError = this.model.getAttribute( 'isError' ),
type = this.model.getAttribute( 'type' ), type = this.model.getAttribute( 'type' ),
borderImage = this.model.getAttribute( 'borderImage' ), borderImage = this.model.getAttribute( 'borderImage' ),
hasBorderOrFrame = ( type !== 'none' && type !== 'frameless' ) || borderImage; hasBorderOrFrame = ( type !== 'none' && type !== 'frameless' ) || borderImage;
if ( isError ) {
this.$element.css( { width: '', height: '' } );
return;
}
if ( !dimensions ) { if ( !dimensions ) {
dimensions = { dimensions = {
width: this.model.getAttribute( 'width' ), width: this.model.getAttribute( 'width' ),