Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/87666


Change subject: Prevent deletion of FocusableNodes from a collapsed selection
......................................................................

Prevent deletion of FocusableNodes from a collapsed selection

Instead select the node and require the user to press delete
again if they really meant to delete the node.

Bug: 55336
Change-Id: I66520e18740e78ce6313f9b31bb575d06b91bea8
---
M modules/ve/ce/ve.ce.Surface.js
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/66/87666/1

diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index 86aabb9..066b6ee 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -1522,6 +1522,13 @@
                        ( e.altKey === true || e.ctrlKey === true ) ? 'word' : 
'character',
                        true
                );
+               // If the user tries to delete a focusable node from a 
collapsed selection,
+               // just select the node and cancel the deletion.
+               startNode = 
this.documentView.getDocumentNode().getNodeFromOffset( rangeToRemove.start + 1 
);
+               if ( ve.isMixedIn( startNode, ve.ce.FocusableNode ) ) {
+                       this.model.change( null, rangeToRemove );
+                       return;
+               }
                if ( rangeToRemove.isCollapsed() ) {
                        // For instance beginning or end of the document.
                        return;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66520e18740e78ce6313f9b31bb575d06b91bea8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>

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

Reply via email to