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

Merge "Fix inserting replies inside a <pre>"

Browse source
This commit is contained in:
jenkins-bot 2020-04-28 22:31:45 +00:00 committed by Gerrit Code Review
parent 021c981817 047e8eb82c
commit 5fdf6ae466
5 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extension.json
View file

@ -194,6 +194,8 @@
"cases/split-list/split-list-modified.html",
"cases/split-list2/split-list2.html",
"cases/split-list2/split-list2-modified.html",
"cases/wrappers/wrappers.html",
"cases/wrappers/wrappers-modified.html",
"cases/signatures-funny/signatures-funny.html",
"cases/signatures-funny/signatures-funny-modified.html",
"cases/signatures-funny/signatures-funny-reply.html"

2
modules/modifier.js
View file

@ -94,7 +94,7 @@ function addListItem( comment ) {
// If we can't insert a list directly inside this element, insert after it.
// TODO Improve this check
if ( parent.tagName.toLowerCase() === 'p' ) {
if ( parent.tagName.toLowerCase() === 'p' || parent.tagName.toLowerCase() === 'pre' ) {
parent = parent.parentNode;
target = target.parentNode;
}

11
tests/qunit/cases/wrappers/wrappers-modified.html Normal file
View file

@ -0,0 +1,11 @@
<h2>paragraph (outside)</h2>
<p>blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)</p><dl><dd data-parsoid="{}">Reply to Matma Rex|2020-01-22T23:19:00.000Z|0</dd></dl>
<h2>preformatted (outside)</h2>
<pre>blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)</pre><dl><dd data-parsoid="{}">Reply to Matma Rex|2020-01-22T23:19:00.000Z|1</dd></dl>
<h2>div (inside)</h2>
<div>blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)<dl><dd data-parsoid="{}">Reply to Matma Rex|2020-01-22T23:19:00.000Z|2</dd></dl></div>
<h2>table (inside)</h2>
<table><tbody><tr><td>blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)<dl><dd data-parsoid="{}">Reply to Matma Rex|2020-01-22T23:19:00.000Z|3</dd></dl></td></tr></tbody></table>

11
tests/qunit/cases/wrappers/wrappers.html Normal file
View file

@ -0,0 +1,11 @@
<h2>paragraph (outside)</h2>
<p>blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)</p>
<h2>preformatted (outside)</h2>
<pre>blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)</pre>
<h2>div (inside)</h2>
<div>blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)</div>
<h2>table (inside)</h2>
<table><tr><td>blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)</td></tr></table>

7
tests/qunit/modifier.test.js
View file

@ -67,6 +67,13 @@ QUnit.test( '#addListItem/#removeListItem', function ( assert ) {
config: require( './data/enwiki-config.json' ),
data: require( './data/enwiki-data.json' )
},
{
name: 'Reply inserted inside/outside various wrapper elements',
dom: mw.template.get( 'test.DiscussionTools', 'cases/wrappers/wrappers.html' ).render(),
expected: mw.template.get( 'test.DiscussionTools', 'cases/wrappers/wrappers-modified.html' ).render(),
config: require( './data/enwiki-config.json' ),
data: require( './data/enwiki-data.json' )
},
{
name: 'Signatures in funny places',
dom: mw.template.get( 'test.DiscussionTools', 'cases/signatures-funny/signatures-funny.html' ).render(),