jenkins-bot has submitted this change and it was merged.
Change subject: Move selection to end of insertion after paste
......................................................................
Move selection to end of insertion after paste
Assuming this was broken by changes to translateRange.
Bug: 48603
Change-Id: Ia2a2120cb75aa86374b594ae3f484c5161028919
---
M modules/ve/ce/ve.ce.Surface.js
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
Objections:
Catrope: There's a problem with this change, please improve
diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index a94feba..4185c91 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -570,6 +570,7 @@
// Pasting into a range? Remove first.
if ( !rangy.getSelection().isCollapsed ) {
tx = ve.dm.Transaction.newFromRemoval( view.documentView.model,
selection );
+ selection = tx.translateRange( selection );
view.model.change( tx );
}
@@ -614,7 +615,10 @@
view.documentView.documentNode.$.focus();
$window.scrollTop( scrollTop );
- view.model.change( tx, tx.translateRange( selection ).truncate(
0 ) );
+ selection = tx.translateRange( selection );
+ view.model.change( tx, new ve.Range( selection.start ) );
+ // Move cursor to end of selection
+ view.model.change( null, new ve.Range( selection.end ) );
// Allow pasting again
view.pasting = false;
--
To view, visit https://gerrit.wikimedia.org/r/64484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2a2120cb75aa86374b594ae3f484c5161028919
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
