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

When pasting, try to use original range

Browse source 
This functionality was (accidentally?) removed by I8f8a240a. It
stops us from over-zealously balancing data when we can get away
with just pasting the original selected range (e.g. it always wraps
collections of text and content nodes in another paragraph).

Bug: 53364
Change-Id: I93fa56c4e43083993c310e0050087e9d1de1e08b
This commit is contained in:
Ed Sanders 2013-08-26 11:40:39 -07:00
parent fd410c03a7
commit ddb608e6bc
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/ve/ce/ve.ce.Surface.js
View file

@ -684,6 +684,23 @@ ve.ce.Surface.prototype.onPaste = function ( e ) {
)
);
}
try {
// Try to paste in the orignal data
// Take a copy to prevent the data being annotated a second time in the catch block
pasteData = ve.copy( slice.getData() );
// Annotate
ve.dm.Document.addAnnotationsToData( pasteData, this.model.getInsertionAnnotations() );
// Transaction
tx = ve.dm.Transaction.newFromInsertion(
view.documentView.model,
selection.start,
pasteData
);
} catch ( e ) {
// If that fails, balance the data before pasting
pasteData = slice.getBalancedData();
// Annotate
@ -695,6 +712,7 @@ ve.ce.Surface.prototype.onPaste = function ( e ) {
selection.start,
pasteData
);
}
// Restore focus and scroll position
view.documentView.documentNode.$[0].focus();