jenkins-bot has submitted this change and it was merged.
Change subject: Don't call setInsertionAnnotations on handleInsertion
......................................................................
Don't call setInsertionAnnotations on handleInsertion
It seems this code is obselete since f81b99026c59ba62b0764a402c4fffdc10379223
(which determines
annotations from context more carefully).
Bug: T111047
Change-Id: I5085400090dc81d1b9c6c56673d4905857a1ae52
---
M src/ce/ve.ce.Surface.js
1 file changed, 1 insertion(+), 8 deletions(-)
Approvals:
Jforrester: 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 8b55840..7b07423 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -3370,7 +3370,7 @@
* Handle insertion of content.
*/
ve.ce.Surface.prototype.handleInsertion = function () {
- var range, annotations, cellSelection, hasChanged, selection,
documentModel;
+ var range, cellSelection, hasChanged, selection, documentModel;
// Don't allow a user to delete a focusable node just by typing
if ( this.focusedNode ) {
@@ -3383,11 +3383,9 @@
if ( selection instanceof ve.dm.TableSelection ) {
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();
}
@@ -3399,10 +3397,6 @@
// Handles removing expanded selection before inserting new text
if ( !range.isCollapsed() ) {
- // Pull annotations from the first character in the selection
- annotations = documentModel.data.getAnnotationsFromRange(
- new ve.Range( range.start, range.start + 1 )
- );
if ( !this.documentView.rangeInsideOneLeafNode( range ) ) {
this.model.change(
ve.dm.Transaction.newFromRemoval(
@@ -3415,7 +3409,6 @@
this.surfaceObserver.clear();
range = this.model.getSelection().getRange();
}
- this.model.setInsertionAnnotations( annotations );
}
if ( hasChanged ) {
--
To view, visit https://gerrit.wikimedia.org/r/235054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5085400090dc81d1b9c6c56673d4905857a1ae52
Gerrit-PatchSet: 6
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec <da...@troi.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Divec <da...@troi.org>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
