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

Support dt/dd transitions in the middle of the stack

Browse source 
Change-Id: I1d75caa7782d02a2c33413a078e99b17ccc4141c
This commit is contained in:
Gabriel Wicke 2012-06-21 18:35:01 +02:00
parent b3bd2ffe8d
commit cc1afb2ad3
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/parser/ext.core.ListHandler.js
View file

@ -100,7 +100,7 @@ ListHandler.prototype.popTags = function ( n ) {
return tokens;
};
ListHandler.prototype.isDlDd = function (a, b) {
ListHandler.prototype.isDtDd = function (a, b) {
var ab = [a,b].sort();
return (ab[0] === ':' && ab[1] === ';');
};
@ -130,17 +130,18 @@ ListHandler.prototype.doListItem = function ( bs, bn, token ) {
];
} else {
var tokens = [];
if ( bs.length <= bn.length &&
bs.length - prefixLen === 1 &&
this.isDlDd( bs[prefixLen], bn[prefixLen] ) )
if ( bs.length > prefixLen &&
bn.length > prefixLen &&
this.isDtDd( bs[prefixLen], bn[prefixLen] ) )
{
tokens = this.popTags(bs.length - prefixLen - 1);
// handle dd/dt transitions
var newName = this.bulletCharsMap[bn[prefixLen]].item;
var endTag = this.endtags.pop();
this.endtags.push(new EndTagTk( newName ));
// TODO: review dataAttribs forwarding here and below in
// doListItem, in particular re accuracy of tsr!
tokens = [ endTag, new TagTk( newName, [], token.dataAttribs ) ];
tokens = tokens.concat([ endTag, new TagTk( newName, [], token.dataAttribs ) ]);
prefixLen++;
} else {
tokens = tokens.concat( this.popTags(bs.length - prefixLen) );