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

Ensure highlighted comment is defined before we try to show auto topic sub popup next to it

Browse source 
This was a logical merge conflict between 4912a1bf5c and 9ded06a655
that I didn't notice when rebasing the latter. Waiting for the
'mobile.init' module to load changes the order of operations if we're
highlighting the new comment after reloading a page, which we also do
after creating new talk page with the new topic tool.

Bug: T295945
Change-Id: Ief4810cc67c1bda9256585da1e2140b3a222dc5e
This commit is contained in:
Bartosz Dziewoński 2021-11-18 15:56:29 +01:00
parent 0110fe8b8d
commit b3b28dd1ab
1 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
modules/controller.js
View file

@ -779,42 +779,42 @@ function init( $container, state ) {
}, 3000 ); }, 3000 );
} ); } );
} }
} );
// Check topic subscription states if the user has automatic subscriptions enabled // Check topic subscription states if the user has automatic subscriptions enabled
// and has recently edited this page. // and has recently edited this page.
if ( featuresEnabled.autotopicsub && mw.user.options.get( 'discussiontools-autotopicsub' ) ) { if ( featuresEnabled.autotopicsub && mw.user.options.get( 'discussiontools-autotopicsub' ) ) {
var recentComments = []; var recentComments = [];
var headingsToUpdate = {}; var headingsToUpdate = {};
if ( state.repliedTo ) { if ( state.repliedTo ) {
// Edited by using the reply tool or new topic tool. Only check the edited topic. // Edited by using the reply tool or new topic tool. Only check the edited topic.
if ( state.repliedTo === utils.NEW_TOPIC_COMMENT_ID ) { if ( state.repliedTo === utils.NEW_TOPIC_COMMENT_ID ) {
recentComments.push( threadItems[ threadItems.length - 1 ] ); recentComments.push( threadItems[ threadItems.length - 1 ] );
} else { } else {
recentComments.push( threadItemsById[ state.repliedTo ] ); recentComments.push( threadItemsById[ state.repliedTo ] );
} }
} else if ( mw.config.get( 'wgPostEdit' ) ) { } else if ( mw.config.get( 'wgPostEdit' ) ) {
// Edited by using wikitext editor. Check topics with their own comments within last minute. // Edited by using wikitext editor. Check topics with their own comments within last minute.
for ( i = 0; i < threadItems.length; i++ ) { for ( i = 0; i < threadItems.length; i++ ) {
if ( if (
threadItems[ i ] instanceof CommentItem && threadItems[ i ] instanceof CommentItem &&
threadItems[ i ].author === mw.user.getName() && threadItems[ i ].author === mw.user.getName() &&
threadItems[ i ].timestamp.isSameOrAfter( moment().subtract( 1, 'minute' ), 'minute' ) threadItems[ i ].timestamp.isSameOrAfter( moment().subtract( 1, 'minute' ), 'minute' )
) { ) {
recentComments.push( threadItems[ i ] ); recentComments.push( threadItems[ i ] );
}
} }
} }
} for ( i = 0; i < recentComments.length; i++ ) {
for ( i = 0; i < recentComments.length; i++ ) { var headingItem = recentComments[ i ].getHeading();
var headingItem = recentComments[ i ].getHeading(); while ( headingItem instanceof HeadingItem && headingItem.headingLevel !== 2 ) {
while ( headingItem instanceof HeadingItem && headingItem.headingLevel !== 2 ) { headingItem = headingItem.parent;
headingItem = headingItem.parent; }
// Use names as object keys to deduplicate if there are multiple comments in a topic.
headingsToUpdate[ headingItem.name ] = headingItem;
} }
// Use names as object keys to deduplicate if there are multiple comments in a topic. updateSubscriptionStates( $container, headingsToUpdate );
headingsToUpdate[ headingItem.name ] = headingItem;
} }
updateSubscriptionStates( $container, headingsToUpdate ); } );
}
// Preload page metadata. // Preload page metadata.
// TODO: Isn't this too early to load it? We will only need it if the user tries replying... // TODO: Isn't this too early to load it? We will only need it if the user tries replying...