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

Merge "Preserve the class attribute for block images"

Browse source
This commit is contained in:
jenkins-bot 2013-06-24 23:51:51 +00:00 committed by Gerrit Code Review
parent 904cdbbb79 5212505648
commit eea2f640d7
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/ve/dm/nodes/ve.dm.MWBlockImageNode.js
View file

@ -54,7 +54,8 @@ ve.dm.MWBlockImageNode.static.toDataElement = function ( domElements, converter
src: $img.attr( 'src' ),
width: $img.attr( 'width' ),
height: $img.attr( 'height' ),
resource: $img.attr( 'resource' )
resource: $img.attr( 'resource' ),
originalClasses: classes
};
// Extract individual classes
@ -114,7 +115,9 @@ ve.dm.MWBlockImageNode.static.toDomElements = function ( data, doc, converter )
figure = doc.createElement( 'figure' ),
a = doc.createElement( 'a' ),
img = doc.createElement( 'img' ),
wrapper = doc.createElement( 'div' );
wrapper = doc.createElement( 'div' ),
classes = [],
originalClasses = dataElement.attributes.originalClasses;
// Type
switch ( dataElement.attributes.type ) {
@ -131,25 +134,30 @@ ve.dm.MWBlockImageNode.static.toDomElements = function ( data, doc, converter )
// Default-size
if ( dataElement.attributes.defaultSize === true ) {
figure.className += ' mw-default-size';
classes.push( 'mw-default-size' );
}
// Horizontal alignment
switch ( dataElement.attributes.align ) {
case 'left':
figure.className += ' mw-halign-left';
classes.push( 'mw-halign-left' );
break;
case 'right':
figure.className += ' mw-halign-right';
classes.push( 'mw-halign-right' );
break;
case 'center':
figure.className += ' mw-halign-center';
classes.push( 'mw-halign-center' );
break;
case 'none':
figure.className += ' mw-halign-none';
classes.push( 'mw-halign-none' );
break;
}
if ( originalClasses && ve.compare( originalClasses.split( ' ' ).sort(), classes.sort() ) ) {
figure.className = originalClasses;
} else if ( classes.length > 0 ) {
figure.className = classes.join( ' ' );
}
a.setAttribute( 'rel', 'mw:thumb' );
a.setAttribute( 'href', dataElement.attributes.href );
img.setAttribute( 'src', dataElement.attributes.src );

10
modules/ve/test/dm/ve.dm.example.js
View file

@ -3367,18 +3367,19 @@ ve.dm.example.domToDataCases = {
]
},
'thumb image': {
'html': '<body><figure typeof="mw:Image/Thumb"><a rel="mw:thumb" href="Foo"><img src="Bar" width="1" height="2" resource="FooBar"></a><figcaption class="mw-figcaption">abc</figcaption></figure></body>',
'html': '<body><figure typeof="mw:Image/Thumb" class="mw-halign-right"><a rel="mw:thumb" href="Foo"><img src="Bar" width="1" height="2" resource="FooBar"></a><figcaption class="mw-figcaption">abc</figcaption></figure></body>',
'data': [
{
'type': 'mwBlockImage',
'attributes': {
'type': 'thumb',
'align': 'default',
'align': 'right',
'href': 'Foo',
'src': 'Bar',
'width': '1',
'height': '2',
'resource': 'FooBar'
'resource': 'FooBar',
'originalClasses': 'mw-halign-right'
}
},
{ 'type': 'mwImageCaption' },
@ -3403,7 +3404,8 @@ ve.dm.example.domToDataCases = {
'src': 'Bar',
'width': '1',
'height': '2',
'resource': 'FooBar'
'resource': 'FooBar',
'originalClasses': undefined
},
'htmlAttributes': [ {
'values': { 'data-parsoid': '{}' },