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

Fixes for definition lists

Browse source
This commit is contained in:
Gabriel Wicke 2011-11-04 11:08:11 +00:00
parent 85def70a8a
commit 83a80bad49
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/es/serializers/es.HtmlSerializer.js
View file

@ -99,13 +99,14 @@ es.HtmlSerializer.prototype.list = function( node ) {
var commonPrefixLength = function (x, y) {
var minLength = Math.min(x.length, y.length);
for(var i = 0; i < minLength; i++) {
if (x[i] !== y[i]
if (x[i] !== y[i]) {
// Both definitiondata and definitionterm are
// inside dls, so consider them equivalent here.
&& [x[i], y[i]].sort()
!== ['definitiondata', 'definitionterm'] )
{
var diffs = [x[i], y[i]].sort();
if (diffs[0] !== 'definitiondata'
&& diffs[1] !== 'definitionterm' ) {
break;
}
}
}
return i;

25
modules/parser/pegParser.pegjs.txt
View file

@ -55,8 +55,8 @@
var level_padding = "";
var bracket_level_padding = "";
for (var j = 0; j < level + 1; j++) level_padding += " ";
for (var b = 0; b < level; b++) bracket_level_padding += " ";
for (var j = 0; j < level + 1; j++) level_padding += " ";
for (var b = 0; b < level; b++) bracket_level_padding += " ";
if (typeof(arr) == 'object') { //Array/Hashes/Objects
dumped_text += "Array\n";
@ -74,8 +74,8 @@
}
dumped_text += bracket_level_padding + ")\n\n";
} else { //Stings/Chars/Numbers etc.
dumped_text = "===>" + arr + "<===(" + typeof(arr) + ")";
} else { //Strings/Chars/Numbers etc.
dumped_text = "=>" + arr + "<=(" + typeof(arr) + ")";
}
return dumped_text;
@ -566,19 +566,20 @@ ext_param_val
lists = es:(dtdd / li)+
{
// flatten es
// Flatten es
var esLen = es.length;
var flatEs = [];
for (var i = 0; i < esLen; i++) {
if (es[i].constructor === Array) {
flatEs.concat(es[i]);
var ei = es[i];
if ($.isArray(ei)) {
flatEs = flatEs.concat(ei);
} else {
flatEs.push(es[i]);
flatEs.push(ei);
}
}
return {
type: 'list',
children: es
children: flatEs
}
}
@ -598,7 +599,7 @@ li = bullets:list_char+
dtdd = bullets:list_char+
c:(inline_element / [^:\n])+
":"
d:(inline / anyline)
d:(inline_element / [^\n])+
newline
{
// reject rule if bullets do not end in semicolon
@ -609,12 +610,12 @@ dtdd = bullets:list_char+
{
type: 'listItem',
attributes: {styles: bulletsToTypes(bullets)},
content: c[0]
content: {text: c.join('')}
}, {
type: 'listItem',
attributes: {styles: bulletsToTypes(
bullets.slice(0, bullets.length - 1) + ':')},
content: d[0]
content: {text: d.join('')}
}
]
}