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

Rewrite getMatchingAnnotations to return a hashmap of matching anntations

Browse source 
in the new DM.  Change method name getAnnotationRange from offset to
getAnnotatedRangeFromOffset.  Write tests

Change-Id: I7028803065409e271ceced73e4803954d4a956dc
This commit is contained in:
Rob Moen 2012-05-17 10:46:27 -07:00
parent 58aa0e8137
commit c2a89626d5
2 changed files with 135 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
modules/ve2/dm/ve.dm.DocumentFragment.js
View file

@ -223,7 +223,7 @@ ve.dm.DocumentFragment.prototype.offsetContainsAnnotation = function ( offset, a
* @param {Object} annotation Annotation to test for coverage with
* @returns {ve.Range|null} Range of content covered by annotation, or null if offset is not covered
*/
ve.dm.DocumentFragment.prototype.getAnnotationRangeFromOffset = function ( offset, annotation ) {
ve.dm.DocumentFragment.prototype.getAnnotatedRangeFromOffset = function ( offset, annotation ) {
var start = offset,
end = offset;
if ( this.offsetContainsAnnotation(offset, annotation) === false ) {
@ -246,6 +246,31 @@ ve.dm.DocumentFragment.prototype.getAnnotationRangeFromOffset = function ( offse
return new ve.Range( start, end );
};
/**
* Gets a list of annotations that match a regular expression.
*
* @static
* @methodng
* @param {Array} offsetData first index is a character, followed by an object of annotations
* @param {RegExp} pattern Regular expression pattern to match with
* @returns {Object} hashmap of annotations that match the pattern
*/
ve.dm.DocumentFragment.prototype.getMatchingAnnotations = function( offsetData, pattern ) {
if ( !( pattern instanceof RegExp ) ) {
throw 'Invalid Pattern. Pattern not instance of RegExp';
}
var annotations = offsetData[1],
annotation = {},
matches = {};
for (annotation in annotations) {
if( pattern.test( annotations[annotation].type )){
matches[annotation] = annotations[annotation];
}
}
return matches;
};
/**
* Gets an array of common annnotations across a range.
*

111
tests/ve2/dm/ve.dm.DocumentFragment.test.js
View file

@ -356,7 +356,7 @@ test( 'offsetContainsAnnotation', 1, function(){
}
});
test( 'getAnnotationRangeFromOffset', 1, function(){
test( 'getAnnotatedRangeFromOffset', 1, function(){
var cases = [
{
msg: 'a bold word',
@ -402,10 +402,117 @@ test( 'getAnnotationRangeFromOffset', 1, function(){
fragment = new ve.dm.DocumentFragment( cases[i].data );
deepEqual(
fragment.getAnnotationRangeFromOffset(cases[i].offset, cases[i].annotation),
fragment.getAnnotatedRangeFromOffset(cases[i].offset, cases[i].annotation),
cases[i].expected,
cases[i].msg
);
}
});
test('getMatchingAnnotations', 1, function(){
var cases = [
{
msg: 'link part: ',
data: [
['l', {
'{"type":"bold"}': { 'type': 'bold' },
'{"type":"italic"}': { 'type': 'italic'},
'{"type":"underline"}': { 'type': 'underline'},
'{"type:"link/internal"}': { 'type': 'link/internal' }
}
], //0
['i', {
'{"type":"underline"}': { 'type': 'underline'},
'{"type:"link/internal"}': { 'type': 'link/internal' },
'{"type":"bold"}': { 'type': 'bold' },
'{"type":"italic"}': { 'type': 'italic'}
}
], //1
['n', {
'{"type:"link/internal"}': { 'type': 'link/internal' },
'{"type":"underline"}': { 'type': 'underline'},
'{"type":"bold"}': { 'type': 'bold' },
'{"type":"italic"}': { 'type': 'italic'}
}
], //2
['k', {
'{"type":"bold"}': { 'type': 'bold' },
'{"type":"italic"}': { 'type': 'italic'},
'{"type:"link/internal"}': { 'type': 'link/internal' },
'{"type":"underline"}': { 'type': 'underline'}
}
] //3
],
match: /link\/.*/,
expected: [
{
'{"type:"link/internal"}': { 'type': 'link/internal' }
},
{
'{"type:"link/internal"}': { 'type': 'link/internal' }
},
{
'{"type:"link/internal"}': { 'type': 'link/internal' }
},
{
'{"type:"link/internal"}': { 'type': 'link/internal' }
}
]
},
{
msg: 'bold test: ',
data: [
['b', {
'{"type":"bold"}': { 'type': 'bold' }
}
], //0
['o', {
'{"type":"bold"}': { 'type': 'bold' }
}
], //1
['l', {
'{"type":"bold"}': { 'type': 'bold' }
}
], //2
['d', {
'{"type":"italic"}': { 'type': 'italic'}
}
] //3
],
match: /bold/,
expected: [
{
'{"type":"bold"}': { 'type': 'bold' }
},
{
'{"type":"bold"}': { 'type': 'bold' }
},
{
'{"type":"bold"}': { 'type': 'bold' }
},
{}
]
}
],
fragment,
expectCount = 0;
//count tests
for (var c = 0; c < cases.length; c++) {
expectCount += cases[c].data.length;
}
expect ( expectCount );
for( var i=0;i<cases.length;i++) {
fragment = new ve.dm.DocumentFragment( cases[i].data );
for(var d=0;cases[i].data[d];d++) {
deepEqual(
fragment.getMatchingAnnotations( cases[i].data[d], cases[i].match ),
cases[i].expected[d],
cases[i].msg + d
);
}
}
});