Merge "(bug 50113) Do not display captions for block images which are neither frame nor thumb"

This commit is contained in:
jenkins-bot 2013-06-24 23:57:28 +00:00 committed by Gerrit Code Review
commit 1a8bb8c6ab

View file

@ -71,7 +71,7 @@ ve.ce.MWBlockImageNode = function VeCeMWBlockImageNode( model, config ) {
this.$resizable = this.$image;
// I smell a caption!
if ( this.model.children.length === 1 ) {
if ( type !== 'none' && this.model.children.length === 1 ) {
captionModel = this.model.children[0];
captionView = ve.ce.nodeFactory.create( captionModel.getType(), captionModel );
captionModel.connect( this, { 'update': 'onModelUpdate' } );