https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103470
Revision: 103470
Author: gwicke
Date: 2011-11-17 15:43:31 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
Flatten inline token lists before merging text into text tokens.
Modified Paths:
--------------
trunk/extensions/VisualEditor/modules/parser/pegParser.pegjs.txt
Modified: trunk/extensions/VisualEditor/modules/parser/pegParser.pegjs.txt
===================================================================
--- trunk/extensions/VisualEditor/modules/parser/pegParser.pegjs.txt
2011-11-17 15:28:36 UTC (rev 103469)
+++ trunk/extensions/VisualEditor/modules/parser/pegParser.pegjs.txt
2011-11-17 15:43:31 UTC (rev 103470)
@@ -327,6 +327,7 @@
= c:(text / inline_element / (!inline_breaks ch:. { return ch; }))+ {
var out = [];
var text = '';
+ c = flatten(c);
for (var i = 0; i < c.length; i++) {
if (typeof c[i] == 'string') {
text += c[i];
@@ -348,7 +349,7 @@
= c:(text / !inline_breaks (inline_element / [^\n]))+ {
var out = [];
var text = '';
- //dp("inlineline: " + print_r(c));
+ c = flatten(c);
for (var i = 0; i < c.length; i++) {
if (typeof c[i] == 'string') {
text += c[i];
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
