jenkins-bot has submitted this change and it was merged.
Change subject: ve.ce.Surface: Insert new paragraphs after empty nodes rather
than before
......................................................................
ve.ce.Surface: Insert new paragraphs after empty nodes rather than before
The code was checking the "at the start" case before checking the "at
the end" case, and for empty elements these are equivalent, so new
paragraphs were inserted before. Just flipped the order.
Bug: 59652
Change-Id: I0b748be6d84041a8f5f801bd63d7dcce36debebe
---
M src/ce/ve.ce.Surface.js
1 file changed, 6 insertions(+), 6 deletions(-)
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 84f96a9..b08d8e7 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1954,16 +1954,16 @@
)
) {
// If we're at the start/end of something that's not a
paragraph, insert a paragraph
- // before/after
- if ( cursor === nodeModelRange.from ) {
+ // before/after. Insert after for empty nodes (from === to).
+ if ( cursor === nodeModelRange.to ) {
+ txInsert = ve.dm.Transaction.newFromInsertion(
+ documentModel, nodeModel.getOuterRange().to,
emptyParagraph
+ );
+ } else if ( cursor === nodeModelRange.from ) {
txInsert = ve.dm.Transaction.newFromInsertion(
documentModel, nodeModel.getOuterRange().from,
emptyParagraph
);
advanceCursor = false;
- } else if ( cursor === nodeModelRange.to ) {
- txInsert = ve.dm.Transaction.newFromInsertion(
- documentModel, nodeModel.getOuterRange().to,
emptyParagraph
- );
}
} else if ( e.shiftKey && nodeModel.hasSignificantWhitespace() ) {
// Insert newline
--
To view, visit https://gerrit.wikimedia.org/r/160215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b748be6d84041a8f5f801bd63d7dcce36debebe
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[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
