jenkins-bot has submitted this change and it was merged.

Change subject: Detect collapsed range inside focusable node in 
ve.ce.Surface#onChange
......................................................................


Detect collapsed range inside focusable node in ve.ce.Surface#onChange

When the document starts with a focusable node, and we try to initialise
the selection to [1,1], the current logic does not detect that as being
on the focusable node and tries to do a native selection.

Bug: 54446
Change-Id: Ib515c435314c35c4e9b3802da117b963b3ef4169
---
M modules/ve/ce/ve.ce.Surface.js
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index 4412a18..8e0dd90 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -924,6 +924,12 @@
                                        next = start;
                                }
                        }
+               } else {
+                       // Check we haven't been programmatically placed inside 
a focusable node with a collapsed selection
+                       start = 
this.documentView.getDocumentNode().getNodeFromOffset( selection.start );
+                       if ( ve.isMixedIn( start, ve.ce.FocusableNode ) ) {
+                               next = start;
+                       }
                }
                // Update nodes if something changed
                if ( previous !== next ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib515c435314c35c4e9b3802da117b963b3ef4169
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/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

Reply via email to