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

Fix transclusion clipboard logic

Browse source 
Run isForClipboard path in MWTransclusion node
even if we have originalDomElements.

Change-Id: Ib5c77888ef41d26e827dbb9a20925e251527a99a
This commit is contained in:
Ed Sanders 2015-02-22 19:23:32 -08:00 committed by Roan Kattouw
parent 07077da54e
commit 65d26891ae
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
View file

@ -97,10 +97,19 @@ ve.dm.MWTransclusionNode.static.toDataElement = function ( domElements, converte
};
ve.dm.MWTransclusionNode.static.toDomElements = function ( dataElement, doc, converter ) {
var els, currentDom, i, len, wrapper, span,
var els, i, len, span,
index = converter.getStore().indexOfHash( OO.getHash( [ this.getHashObject( dataElement ), undefined ] ) ),
originalMw = dataElement.attributes.originalMw;
function wrapTextNode( node ) {
if ( node.nodeType === Node.TEXT_NODE ) {
var wrapper = doc.createElement( 'span' );
wrapper.appendChild( node );
return wrapper;
}
return node;
}
// If the transclusion is unchanged just send back the
// original DOM elements so selser can skip over it
if (
@ -112,19 +121,15 @@ ve.dm.MWTransclusionNode.static.toDomElements = function ( dataElement, doc, con
// The object in the store is also used for CE rendering so return a copy
els = ve.copyDomElements( dataElement.originalDomElements, doc );
} else {
if ( dataElement.originalDomElements ) {
if ( converter.isForClipboard() && index !== null ) {
// For the clipboard use the current DOM contents so the user has something
// meaningful to paste into external applications
els = ve.copyDomElements( converter.getStore().value( index ), doc );
els[0] = wrapTextNode( els[0] );
} else if ( dataElement.originalDomElements ) {
els = [ doc.createElement( dataElement.originalDomElements[0].nodeName ) ];
} else {
els = [ doc.createElement( 'span' ) ];
if ( converter.isForClipboard() ) {
// For the clipboard use the current DOM contents so the user has something
// meaningful to paste into external applications
currentDom = converter.getStore().value( index );
if ( currentDom ) {
// Ignore currentDom[0] as that is the data-mw span we are recreating
els = els.concat( ve.copyDomElements( currentDom.slice( 1 ), doc ) );
}
}
}
// All we need to send back to Parsoid is the original transclusion marker, with a
// reconstructed data-mw property.
@ -153,11 +158,7 @@ ve.dm.MWTransclusionNode.static.toDomElements = function ( dataElement, doc, con
// ... and mark all but the first child as ignorable
for ( i = 1, len = els.length; i < len; i++ ) {
// Wrap plain text nodes so we can give them an attribute
if ( els[i].nodeType === Node.TEXT_NODE ) {
wrapper = doc.createElement( 'span' );
wrapper.appendChild( els[i] );
els[i] = wrapper;
}
els[i] = wrapTextNode( els[i] );
els[i].setAttribute( 'data-ve-ignore', 'true' );
}
}