http://www.mediawiki.org/wiki/Special:Code/MediaWiki/93809
Revision: 93809
Author: brion
Date: 2011-08-03 08:05:22 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
ParserPlayground: fix for li output; initial list item detection; needs more
clarity.
Modified Paths:
--------------
trunk/extensions/ParserPlayground/modules/ext.parserPlayground.renderer.js
trunk/extensions/ParserPlayground/modules/pegParser.pegjs.txt
trunk/extensions/ParserPlayground/tests/parserTests.js
Modified:
trunk/extensions/ParserPlayground/modules/ext.parserPlayground.renderer.js
===================================================================
--- trunk/extensions/ParserPlayground/modules/ext.parserPlayground.renderer.js
2011-08-03 08:00:23 UTC (rev 93808)
+++ trunk/extensions/ParserPlayground/modules/ext.parserPlayground.renderer.js
2011-08-03 08:05:22 UTC (rev 93809)
@@ -129,10 +129,10 @@
$.map(tree.attrs, function(val, key) {
$span.attr(key, val); // @fixme safety!
});
- if ('content' in tree) {
- subParseArray(tree.content, $span);
- }
}
+ if ('content' in tree) {
+ subParseArray(tree.content, $span);
+ }
node = $span[0];
break;
case 'hashlink':
Modified: trunk/extensions/ParserPlayground/modules/pegParser.pegjs.txt
===================================================================
--- trunk/extensions/ParserPlayground/modules/pegParser.pegjs.txt
2011-08-03 08:00:23 UTC (rev 93808)
+++ trunk/extensions/ParserPlayground/modules/pegParser.pegjs.txt
2011-08-03 08:05:22 UTC (rev 93809)
@@ -15,6 +15,7 @@
block
= br
/ h
+ / li
/ para
h = h1 / h2 / h3 / h4 / h5 / h6
@@ -345,3 +346,21 @@
= t:[0-9A-Za-z]+ { return {text: t.join('') } }
/ "'" t:[^'>]+ "'" { return { quote: "'", text: t.join('') } }
/ '"' t:[^">]+ '"' { return { quote: '"', text: t.join('') } }
+
+
+li = bullets:list_char+
+ c:(inline / anything)
+ newline
+{
+ return {
+ type: 'li',
+ listStyle: bullets,
+ content: c
+ };
+}
+
+list_char =
+ '*' /
+ '#' /
+ ':' /
+ ';'
Modified: trunk/extensions/ParserPlayground/tests/parserTests.js
===================================================================
--- trunk/extensions/ParserPlayground/tests/parserTests.js 2011-08-03
08:00:23 UTC (rev 93808)
+++ trunk/extensions/ParserPlayground/tests/parserTests.js 2011-08-03
08:05:22 UTC (rev 93809)
@@ -128,6 +128,10 @@
if (err) {
console.log('RENDER FAIL', err);
} else {
+ console.log('EXPECTED:');
+ console.log(item.result + "\n");
+
+ console.log('RENDERED:');
console.log(node.innerHTML + "\n");
}
});
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
