Merge "ve.dm.MWTransclusionModel: Remove workaround for T135127"

This commit is contained in:
jenkins-bot 2019-01-16 18:39:41 +00:00 committed by Gerrit Code Review
commit 27a596e4f0

View file

@ -70,7 +70,6 @@
function insertNode( isInline, generatedContents ) {
var hash, store, nodeClass,
type = isInline ? baseNodeClass.static.inlineType : baseNodeClass.static.blockType,
range = surfaceFragment.getSelection().getCoveringRange(),
data = [
{
type: type,
@ -90,16 +89,8 @@
store.hash( generatedContents, hash );
}
if ( range.isCollapsed() ) {
surfaceFragment.insertContent( data );
} else {
// Generate a replacement transaction instead of using surfaceFragment.insertContent
// (which generates a removal and insertion) as blanking a reference triggers T135127.
// TODO: Once T135127 is fixed, revert to using surfaceFragment.insert.
surfaceFragment.getSurface().change(
ve.dm.TransactionBuilder.static.newFromReplacement( surfaceFragment.getDocument(), range, data )
);
}
surfaceFragment.insertContent( data );
deferred.resolve();
}