wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-12-01 09:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
jenkins-bot 2019-01-16 18:39:41 +00:00 committed by Gerrit Code Review
parent 8168795de6 18f8697703
commit 27a596e4f0
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
View file

@ -70,7 +70,6 @@
function insertNode( isInline, generatedContents ) { function insertNode( isInline, generatedContents ) {
var hash, store, nodeClass, var hash, store, nodeClass,
type = isInline ? baseNodeClass.static.inlineType : baseNodeClass.static.blockType, type = isInline ? baseNodeClass.static.inlineType : baseNodeClass.static.blockType,
range = surfaceFragment.getSelection().getCoveringRange(),
data = [ data = [
{ {
type: type, type: type,
@ -90,16 +89,8 @@
store.hash( generatedContents, hash ); store.hash( generatedContents, hash );
} }
if ( range.isCollapsed() ) { surfaceFragment.insertContent( data );
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 )
);
}
deferred.resolve(); deferred.resolve();
} }