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

Use ClassAttributeNode mixin in MWBlockImageNode

Browse source 
This functionality was factored out into core for this purpose.

Depends on I2db6563 in core.

Change-Id: I4fc42e1468a9f0860c7c13e73967204bdf5ad78d
This commit is contained in:
Ed Sanders 2014-10-28 11:46:40 +00:00 committed by Jforrester
parent 44816dfa7f
commit cfee8047e4
2 changed files with 23 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
View file

@ -11,6 +11,7 @@
* @class
* @extends ve.dm.BranchNode
* @mixins ve.dm.MWImageNode
* @mixins ve.dm.ClassAttributeNode
*
* @constructor
* @param {Object} [element] Reference to element in linear model
@ -22,6 +23,7 @@ ve.dm.MWBlockImageNode = function VeDmMWBlockImageNode() {
// Mixin constructors
ve.dm.MWImageNode.call( this );
ve.dm.ClassAttributeNode.call( this );
};
/* Inheritance */
@ -33,6 +35,8 @@ OO.mixinClass( ve.dm.MWBlockImageNode, ve.dm.GeneratedContentNode );
OO.mixinClass( ve.dm.MWBlockImageNode, ve.dm.MWImageNode );
OO.mixinClass( ve.dm.MWBlockImageNode, ve.dm.ClassAttributeNode );
/* Static Properties */
ve.dm.MWBlockImageNode.static.rdfaToType = {
@ -60,6 +64,15 @@ ve.dm.MWBlockImageNode.static.getMatchRdfaTypes = function () {
return ve.getObjectKeys( this.rdfaToType );
};
ve.dm.MWBlockImageNode.static.classAttributes = {
'mw-image-border': { borderImage: true },
'mw-halign-left': { align: 'left' },
'mw-halign-right': { align: 'right' },
'mw-halign-center': { align: 'center' },
'mw-halign-none': { align: 'none' },
'mw-default-size': { defaultSize: true }
};
ve.dm.MWBlockImageNode.static.toDataElement = function ( domElements, converter ) {
var dataElement, newDimensions,
$figure = $( domElements[0] ),
@ -67,15 +80,13 @@ ve.dm.MWBlockImageNode.static.toDataElement = function ( domElements, converter
$imgWrapper = $figure.children( 'a, span' ).eq( 0 ),
$img = $imgWrapper.children( 'img' ).eq( 0 ),
$caption = $figure.children( 'figcaption' ).eq( 0 ),
classAttr = $figure.attr( 'class' ),
typeofAttr = $figure.attr( 'typeof' ),
classes = $figure.attr( 'class' ),
recognizedClasses = [],
attributes = {
type: this.rdfaToType[typeofAttr],
href: $imgWrapper.attr( 'href' ) || '',
src: $img.attr( 'src' ),
resource: $img.attr( 'resource' ),
originalClasses: classes
resource: $img.attr( 'resource' )
},
width = $img.attr( 'width' ),
height = $img.attr( 'height' ),
@ -85,40 +96,15 @@ ve.dm.MWBlockImageNode.static.toDataElement = function ( domElements, converter
attributes.alt = altText;
}
// Extract individual classes
classes = typeof classes === 'string' ? classes.trim().split( /\s+/ ) : [];
this.setClassAttributes( attributes, classAttr );
// Deal with border flag
if ( classes.indexOf( 'mw-image-border' ) !== -1 ) {
attributes.borderImage = true;
recognizedClasses.push( 'mw-image-border' );
}
// Horizontal alignment
if ( classes.indexOf( 'mw-halign-left' ) !== -1 ) {
attributes.align = 'left';
recognizedClasses.push( 'mw-halign-left' );
} else if ( classes.indexOf( 'mw-halign-right' ) !== -1 ) {
attributes.align = 'right';
recognizedClasses.push( 'mw-halign-right' );
} else if ( classes.indexOf( 'mw-halign-center' ) !== -1 ) {
attributes.align = 'center';
recognizedClasses.push( 'mw-halign-center' );
} else if ( classes.indexOf( 'mw-halign-none' ) !== -1 ) {
attributes.align = 'none';
recognizedClasses.push( 'mw-halign-none' );
} else {
attributes.align = 'default';
}
attributes.align = attributes.align || 'default';
attributes.width = width !== undefined && width !== '' ? Number( width ) : null;
attributes.height = height !== undefined && height !== '' ? Number( height ) : null;
// Default-size
if ( classes.indexOf( 'mw-default-size' ) !== -1 ) {
// Flag as default size
attributes.defaultSize = true;
recognizedClasses.push( 'mw-default-size' );
if ( attributes.defaultSize ) {
// Force wiki-default size for thumb and frameless
if (
attributes.type === 'thumb' ||
@ -141,9 +127,6 @@ ve.dm.MWBlockImageNode.static.toDataElement = function ( domElements, converter
}
}
// Store unrecognized classes so we can restore them on the way out
attributes.unrecognizedClasses = OO.simpleArrayDifference( classes, recognizedClasses );
dataElement = { type: this.name, attributes: attributes };
this.storeGeneratedContents( dataElement, dataElement.attributes.src, converter.getStore() );
@ -172,8 +155,7 @@ ve.dm.MWBlockImageNode.static.toDomElements = function ( data, doc, converter )
imgWrapper = doc.createElement( dataElement.attributes.href !== '' ? 'a' : 'span' ),
img = doc.createElement( 'img' ),
wrapper = doc.createElement( 'div' ),
classes = [],
originalClasses = dataElement.attributes.originalClasses,
classAttr = this.getClassAttrFromAttributes( dataElement.attributes ),
captionData = data.slice( 1, -1 );
if ( !this.typeToRdfa ) {
@ -185,43 +167,11 @@ ve.dm.MWBlockImageNode.static.toDomElements = function ( data, doc, converter )
// Type
figure.setAttribute( 'typeof', this.typeToRdfa[dataElement.attributes.type] );
if ( dataElement.attributes.borderImage === true ) {
classes.push( 'mw-image-border' );
if ( classAttr ) {
figure.className = classAttr;
}
// Apply classes if size is default
if ( dataElement.attributes.defaultSize === true ) {
classes.push( 'mw-default-size' );
}
// Horizontal alignment
switch ( dataElement.attributes.align ) {
case 'left':
classes.push( 'mw-halign-left' );
break;
case 'right':
classes.push( 'mw-halign-right' );
break;
case 'center':
classes.push( 'mw-halign-center' );
break;
case 'none':
classes.push( 'mw-halign-none' );
break;
}
if ( dataElement.attributes.unrecognizedClasses ) {
classes = OO.simpleArrayUnion( classes, dataElement.attributes.unrecognizedClasses );
}
if (
originalClasses &&
ve.compare( originalClasses.trim().split( /\s+/ ).sort(), classes.sort() )
) {
figure.className = originalClasses;
} else if ( classes.length > 0 ) {
figure.className = classes.join( ' ' );
}
if ( dataElement.attributes.href !== '' ) {
imgWrapper.setAttribute( 'href', dataElement.attributes.href );
}

4
modules/ve-mw/tests/dm/ve.dm.mwExample.js
View file

@ -1974,9 +1974,7 @@ ve.dm.mwExample.domToDataCases = {
src: 'Bar',
width: 1,
height: 2,
resource: 'FooBar',
originalClasses: undefined,
unrecognizedClasses: []
resource: 'FooBar'
},
htmlAttributes: [ {
values: { 'data-parsoid': '{}' },