jenkins-bot has submitted this change and it was merged.

Change subject: Set insertion annotations when typing over cell contents
......................................................................


Set insertion annotations when typing over cell contents

Bug: 72831
Change-Id: Idb0e787f3fa331a0d7fc23e278c6b17a31cdc79c
---
M src/ce/ve.ce.Surface.js
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 50c81d0..2292a9d 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -2519,14 +2519,18 @@
        }
 
        var hasSlug, data, range, newRange, annotations, insertionAnnotations, 
placeholder,
+               cellSelection,
                hasChanged = false,
                selection = this.model.getSelection(),
                documentModel = this.model.getDocument();
 
        if ( selection instanceof ve.dm.TableSelection ) {
-               this.model.setSelection( selection.collapseToFrom() );
+               cellSelection = selection.collapseToFrom();
+               annotations = documentModel.data.getAnnotationsFromRange( 
cellSelection.getRanges()[0] );
+               this.model.setSelection( cellSelection );
                this.handleTableDelete();
                this.documentView.getBranchNodeFromOffset( 
selection.tableRange.start + 1 ).setEditing( true );
+               this.model.setInsertionAnnotations( annotations );
                selection = this.model.getSelection();
        }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/170692
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb0e787f3fa331a0d7fc23e278c6b17a31cdc79c
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to