wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-11-24 16:34:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix client-side IDs for indistinguishable comments"

Browse source
This commit is contained in:
jenkins-bot 2020-11-22 22:38:57 +00:00 committed by Gerrit Code Review
parent db6838a267 d0b6904bae
commit 4eed14b4e7
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/controller.js
View file

@ -208,16 +208,18 @@ function getCheckboxesPromise( pageName, oldId ) {
function init( $container, state ) {
var parser, pageThreads,
repliedToComment,
i, hash, comment, commentNodes, id, newId,
i, hash, comment, commentNodes, newId,
// Loads later to avoid circular dependency
CommentController = require( './CommentController.js' ),
threadItemsById = {};
threadItemsById = {},
threadItems = [];
$pageContainer = $container;
parser = new Parser( $pageContainer[ 0 ] );
pageThreads = [];
commentNodes = $pageContainer[ 0 ].querySelectorAll( '[data-mw-comment]' );
threadItems.length = commentNodes.length;
// The page can be served from the HTTP cache (Varnish), containing data-mw-comment generated
// by an older version of our PHP code. Code below must be able to handle that.
@ -236,16 +238,18 @@ function init( $container, state ) {
// Use unshift as we are in a backwards loop
pageThreads.unshift( comment );
}
threadItems[ i ] = comment;
}
// Recalculate legacy IDs
parser.threadItemsById = {};
for ( id in threadItemsById ) {
comment = threadItemsById[ id ];
// In the forward order this time, as the IDs for indistinguishable comments depend on it
for ( i = 0; i < threadItems.length; i++ ) {
comment = threadItems[ i ];
newId = parser.computeId( comment );
if ( newId !== id ) {
parser.threadItemsById[ newId ] = comment;
if ( newId !== comment.id ) {
comment.id = newId;
parser.threadItemsById[ newId ] = comment;
threadItemsById[ newId ] = comment;
}
}