Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79919
Change subject: getAnnotationsFromRange should only ingnore non-content data
......................................................................
getAnnotationsFromRange should only ingnore non-content data
Currently ignores all non-element data, but element content (e.g.
images) can be annotated.
Bug: 50127
Change-Id: I234586a28072811c8288aab56f6abaaa0da0c88d
---
M modules/ve/dm/lineardata/ve.dm.ElementLinearData.js
1 file changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/19/79919/1
diff --git a/modules/ve/dm/lineardata/ve.dm.ElementLinearData.js
b/modules/ve/dm/lineardata/ve.dm.ElementLinearData.js
index 688d9e5..91ff5fb 100644
--- a/modules/ve/dm/lineardata/ve.dm.ElementLinearData.js
+++ b/modules/ve/dm/lineardata/ve.dm.ElementLinearData.js
@@ -433,9 +433,7 @@
* @returns {ve.dm.AnnotationSet} All annotation objects range is covered by
*/
ve.dm.ElementLinearData.prototype.getAnnotationsFromRange = function ( range,
all ) {
- var i,
- left,
- right;
+ var i, left, right;
// Look at left side of range for annotations
left = this.getAnnotationsFromOffset( range.start );
// Shortcut for single character and zero-length ranges
@@ -444,8 +442,8 @@
}
// Iterator over the range, looking for annotations, starting at the
2nd character
for ( i = range.start + 1; i < range.end; i++ ) {
- // Skip non character data
- if ( this.isElementData( i ) ) {
+ // Skip non-content data
+ if ( this.isElementData( i ) &&
!ve.dm.nodeFactory.isNodeContent( this.getType( i ) ) ) {
continue;
}
// Current character annotations
--
To view, visit https://gerrit.wikimedia.org/r/79919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I234586a28072811c8288aab56f6abaaa0da0c88d
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
