jenkins-bot has submitted this change and it was merged.
Change subject: Use proper methods for detecting data type in
getAnnotationIndexesFromOffset
......................................................................
Use proper methods for detecting data type in getAnnotationIndexesFromOffset
Change-Id: Ib0c11fb20a733ef8795729cc34656309903466aa
---
M modules/ve/dm/lineardata/ve.dm.ElementLinearData.js
1 file changed, 5 insertions(+), 8 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/dm/lineardata/ve.dm.ElementLinearData.js
b/modules/ve/dm/lineardata/ve.dm.ElementLinearData.js
index 39fefd5..72263d1 100644
--- a/modules/ve/dm/lineardata/ve.dm.ElementLinearData.js
+++ b/modules/ve/dm/lineardata/ve.dm.ElementLinearData.js
@@ -275,22 +275,19 @@
if ( offset < 0 || offset > this.getLength() ) {
throw new Error( 'offset ' + offset + ' out of bounds' );
}
- var element = this.getData( offset );
+
// Since annotations are not stored on a closing leaf node,
// rewind offset by 1 to return annotations for that structure
if (
!ignoreClose &&
- ve.isPlainObject( element ) && // structural offset
- element.hasOwnProperty( 'type' ) && // just in case
- element.type.charAt( 0 ) === '/' && // closing offset
- ve.dm.nodeFactory.canNodeHaveChildren(
- element.type.substr( 1 )
- ) === false // leaf node
+ this.isCloseElementData( offset ) &&
+ !ve.dm.nodeFactory.canNodeHaveChildren( this.getType( offset )
) // leaf node
) {
offset = this.getRelativeContentOffset( offset, -1 );
- element = this.getData( offset );
}
+ var element = this.getData( offset );
+
if ( element === undefined || typeof element === 'string' ) {
return [];
} else {
--
To view, visit https://gerrit.wikimedia.org/r/148095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0c11fb20a733ef8795729cc34656309903466aa
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/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
