jenkins-bot has submitted this change and it was merged.
Change subject: Fix treatment of elements in addAnnotationsToData()
......................................................................
Fix treatment of elements in addAnnotationsToData()
It should skip annotating elements, but doesn't.
Change-Id: I28fa83832748eb76fa9238e52074bb785ab1cf49
---
M modules/ve/dm/ve.dm.Document.js
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/dm/ve.dm.Document.js b/modules/ve/dm/ve.dm.Document.js
index 9443022..3d07e5f 100644
--- a/modules/ve/dm/ve.dm.Document.js
+++ b/modules/ve/dm/ve.dm.Document.js
@@ -203,10 +203,15 @@
}
// Apply annotations to data
for ( i = 0, length = data.length; i < length; i++ ) {
- if ( !ve.isArray( data[i] ) ) {
+ if ( data[i].type ) {
+ // Element
+ continue;
+ } else if ( !ve.isArray( data[i] ) ) {
+ // Wrap in array
data[i] = [data[i]];
newAnnotationSet = annotationSet.clone();
} else {
+ // Add to existing array
newAnnotationSet = new ve.dm.AnnotationSet( store,
data[i][1] );
newAnnotationSet.addSet( annotationSet.clone() );
}
--
To view, visit https://gerrit.wikimedia.org/r/70921
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28fa83832748eb76fa9238e52074bb785ab1cf49
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
