jenkins-bot has submitted this change and it was merged.
Change subject: SurfaceFragment#delete: Check removal is not a no-op
......................................................................
SurfaceFragment#delete: Check removal is not a no-op
This can happen if the node to delete was undeletable.
Change-Id: Iacd169ea36cbc2fa349c0d1f6b91cfe45edd14c0
---
M src/dm/ve.dm.SurfaceFragment.js
1 file changed, 15 insertions(+), 12 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/dm/ve.dm.SurfaceFragment.js b/src/dm/ve.dm.SurfaceFragment.js
index fa0384b..a088683 100644
--- a/src/dm/ve.dm.SurfaceFragment.js
+++ b/src/dm/ve.dm.SurfaceFragment.js
@@ -926,18 +926,21 @@
return false;
}
} );
- // Move contents of endNode into startNode, and delete
nodeToDelete
- this.change( [
- ve.dm.Transaction.newFromRemoval(
- this.document,
- nodeToDelete.getOuterRange()
- ),
- ve.dm.Transaction.newFromInsertion(
- this.document,
- rangeAfterRemove.start,
- endNodeData
- )
- ] );
+ tx = ve.dm.Transaction.newFromRemoval(
+ this.document,
+ nodeToDelete.getOuterRange()
+ );
+ if ( !tx.isNoOp() ) {
+ // Move contents of endNode into startNode, and
delete nodeToDelete
+ this.change( [
+ tx,
+ ve.dm.Transaction.newFromInsertion(
+ this.document,
+ rangeAfterRemove.start,
+ endNodeData
+ )
+ ] );
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/281270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iacd169ea36cbc2fa349c0d1f6b91cfe45edd14c0
Gerrit-PatchSet: 2
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
