wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "When annotating, skip any branch nodes that are content"

Browse source
This commit is contained in:
jenkins-bot 2013-05-01 18:06:34 +00:00 committed by Gerrit Code Review
parent b9ba3c92a3 c77ffee98c
commit ff168661b0
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
modules/ve/dm/ve.dm.Transaction.js
View file

@ -207,20 +207,30 @@ ve.dm.Transaction.newFromAnnotation = function ( doc, range, method, annotation
data = doc.data,
i = range.start,
span = i,
on = false;
on = false,
insideContentNode = false;
// Iterate over all data in range, annotating where appropriate
while ( i < range.end ) {
type = data.getType( i );
if ( data.isElementData( i ) && !ve.dm.nodeFactory.isNodeContent( type ) ) {
// Structural element opening or closing
if (
( data.isElementData( i ) && !ve.dm.nodeFactory.isNodeContent( type ) ) ||
( insideContentNode && !data.isCloseElementData( i ) )
) {
// Structural element opening or closing, or entering a content node
if ( on ) {
tx.pushRetain( span );
tx.pushStopAnnotating( method, annotation );
span = 0;
on = false;
}
} else if ( !data.isElementData( i ) || !data.isCloseElementData( i ) ) {
} else if (
( !data.isElementData( i ) || !data.isCloseElementData( i ) ) &&
!insideContentNode
) {
// Character or content element opening
if ( data.isElementData( i ) ) {
insideContentNode = true;
}
covered = data.getAnnotationsFromOffset( i ).contains( annotation );
if ( ( covered && method === 'set' ) || ( !covered && method === 'clear' ) ) {
// Skip annotated content
@ -239,7 +249,10 @@ ve.dm.Transaction.newFromAnnotation = function ( doc, range, method, annotation
on = true;
}
}
} // otherwise it's a content closing, skip those
} else if ( data.isCloseElementData( i ) ) {
// Content closing, skip
insideContentNode = false;
}
span++;
i++;
}