Inez has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59199
Change subject: (bugid 47258) There was not check if anchorNode of selection
range is inside an element with CSS class ve-ce-slug.
......................................................................
(bugid 47258) There was not check if anchorNode of selection range is inside an
element with CSS class ve-ce-slug.
Adding that check let me simplify logic around a little bit as well.
Change-Id: I51bf5e9caecf6a8b4e0f75118a93cfe69a5a6542
---
M modules/ve/ce/ve.ce.SurfaceObserver.js
1 file changed, 6 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/99/59199/1
diff --git a/modules/ve/ce/ve.ce.SurfaceObserver.js
b/modules/ve/ce/ve.ce.SurfaceObserver.js
index 53c4b61..bfa66cc 100644
--- a/modules/ve/ce/ve.ce.SurfaceObserver.js
+++ b/modules/ve/ce/ve.ce.SurfaceObserver.js
@@ -155,14 +155,12 @@
if ( !rangyRange.equals( this.rangyRange ) ){
this.rangyRange = rangyRange;
- $branch = $( rangyRange.anchorNode ).closest(
'.ve-ce-branchNode' );
- if ( $branch.length ) {
- node = $branch.data( 'view' );
- if ( node.canHaveChildrenNotContent() ) {
- node = null;
- } else {
- range = rangyRange.getRange();
- }
+ range = rangyRange.getRange();
+ $nodeOrSlug = $( rangyRange.anchorNode ).closest(
'.ve-ce-branchNode, .ve-ce-slug' );
+ if ( $nodeOrSlug.length && !$nodeOrSlug.hasClass( 've-ce-slug'
) ) {
+ node = $nodeOrSlug.data( 'view' );
+ } else {
+ node = null;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/59199
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51bf5e9caecf6a8b4e0f75118a93cfe69a5a6542
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Inez <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
