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 "highlighter: Set the location hash for new topics on desktop as well"

Browse source
This commit is contained in:
jenkins-bot 2022-04-21 23:55:19 +00:00 committed by Gerrit Code Review
parent 90018a5b55 f411f1c342
commit 4f25201193
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/highlighter.js
View file

@ -174,12 +174,13 @@ function highlightPublishedComment( threadItemSet, threadItemId ) {
) {
highlightComments.push( lastComment.parent );
lastHighlightedPublishedComment = lastComment.parent;
var $collapsibleHeading = $( lastHighlightedPublishedComment.range.startContainer ).closest( '.collapsible-heading' );
// Expand collapsed section on mobile
if ( $collapsibleHeading.length ) {
var id = utils.getHeadlineNodeAndOffset( $collapsibleHeading[ 0 ] ).node.id;
location.hash = '#' + id;
}
// Change URL to point to this section, like the old section=new wikitext editor does.
// This also expands collapsed sections on mobile (T301840).
var sectionTitle = lastHighlightedPublishedComment.getLinkableTitle();
var urlFragment = mw.util.escapeIdForLink( sectionTitle );
// Navigate to fragment without scrolling
location.hash = '#' + urlFragment + '-DoesNotExist-DiscussionToolsHack';
history.replaceState( null, document.title, '#' + urlFragment );
}
} else {
// Find the comment we replied to, then highlight the last reply
@ -318,11 +319,11 @@ function clearHighlightTargetComment( threadItemSet ) {
// * Using history.pushState() does not trigger 'hashchange' or update the :target selector.
// https://developer.mozilla.org/en-US/docs/Web/API/History/pushState#description
// https://github.com/whatwg/html/issues/639
// * Using window.location.hash does, but it also scrolls to the target, which is the top of the
// * Using location.hash does, but it also scrolls to the target, which is the top of the
// page for the empty hash.
// Instead, we first use window.location.hash to navigate to a *different* hash (whose target
// Instead, we first use location.hash to navigate to a *different* hash (whose target
// doesn't exist on the page, hopefully), and then use history.pushState() to clear it.
window.location.hash += '-DoesNotExist-DiscussionToolsHack';
location.hash += '-DoesNotExist-DiscussionToolsHack';
url.hash = '';
history.replaceState( null, document.title, url );
} else if (