jenkins-bot has submitted this change and it was merged.
Change subject: Fix cursoring inside a caption node
......................................................................
Fix cursoring inside a caption node
Instead of checking if the table node is being editing, just check
if the first contenteditable ancestor is ce=true. This catches the
caption node case, and any future case where we might put ce=true
nodes inside ce=false nodes.
Bug: T96356
Change-Id: I03d90b7917a357fecf345b9b6c5cc100ac9fac27
---
M src/ce/ve.ce.Surface.js
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
Divec: 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 33e797e..d3970a2 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1287,7 +1287,7 @@
* @returns {ve.ce.Node|null} node, or null if not in a focusable node
*/
function getSurroundingFocusableNode( node, offset, direction ) {
- var focusNode, $focusableNode;
+ var focusNode, $focusNode;
if ( node.nodeType === Node.TEXT_NODE ) {
focusNode = node;
} else if ( direction > 0 && offset < node.childNodes.length ) {
@@ -1297,12 +1297,13 @@
} else {
focusNode = node;
}
- $focusableNode = $( focusNode ).closest( '.ve-ce-focusableNode,
.ve-ce-tableNode' );
- // If the first thing we found was a table node in editing
mode, ignore it.
- if ( $focusableNode.hasClass( 've-ce-tableNode-editing' ) ) {
+ $focusNode = $( focusNode );
+ // If the first ancestor with contenteditable set is ce=true,
then we are allowed
+ // to be inside this focusalbe node (e.g. editing a table cell
or caption)
+ if ( $focusNode.closest( '[contenteditable]' ).prop(
'contenteditable' ) ) {
return null;
}
- return $focusableNode.data( 'view' ) || null;
+ return $focusNode.closest( '.ve-ce-focusableNode,
.ve-ce-tableNode' ).data( 'view' ) || null;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/204739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I03d90b7917a357fecf345b9b6c5cc100ac9fac27
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Divec <da...@sheetmusic.org.uk>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
