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

CommentController#showAndFocus: Use replyWidgetPromise

Browse source 
We shouldn't assume callers of this method have waited
for the replyWidget to be built.

Bug: T354292
Change-Id: Ic66b4f04b8786b07f520e329adda37efcf498dad
This commit is contained in:
Ed Sanders 2024-01-05 15:26:19 +00:00
parent 555cfcc622
commit 811dce7bf7
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/CommentController.js
View file

@ -345,12 +345,19 @@ CommentController.prototype.focus = function () {
this.replyWidget.focus(); this.replyWidget.focus();
}; };
/**
* Scroll the widget into view and focus it
*/
CommentController.prototype.showAndFocus = function () { CommentController.prototype.showAndFocus = function () {
var commentController = this; var commentController = this;
this.replyWidget.scrollElementIntoView( { padding: scrollPadding } ) if ( this.replyWidgetPromise ) {
.then( function () { this.replyWidgetPromise.then( function ( replyWidget ) {
commentController.focus(); replyWidget.scrollElementIntoView( { padding: scrollPadding } )
.then( function () {
commentController.focus();
} );
} ); } );
}
}; };
CommentController.prototype.teardown = function ( mode ) { CommentController.prototype.teardown = function ( mode ) {

1
modules/controller.js
View file

@ -430,7 +430,6 @@ function init( $container, state ) {
// If the reply widget is already open, activate it. // If the reply widget is already open, activate it.
// Reply links are also made unclickable using 'pointer-events' in CSS, but that doesn't happen // Reply links are also made unclickable using 'pointer-events' in CSS, but that doesn't happen
// for new section links, because we don't have a good way of visually disabling them. // for new section links, because we don't have a good way of visually disabling them.
// (And it also doesn't work on IE 11.)
if ( activeCommentId === commentId ) { if ( activeCommentId === commentId ) {
activeController.showAndFocus(); activeController.showAndFocus();
return; return;