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

Merge "Only re-focus the reply link when reply is abandoned"

Browse source
This commit is contained in:
jenkins-bot 2020-06-12 18:17:13 +00:00 committed by Gerrit Code Review
parent f115f3ce3d 09857e13f1
commit 02d049affe
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/CommentController.js
View file

@ -245,7 +245,7 @@ CommentController.prototype.setupReplyWidget = function ( replyWidget, initialVa
this.replyWidget = replyWidget;
};
CommentController.prototype.teardown = function () {
CommentController.prototype.teardown = function ( abandoned ) {
this.$replyLinkButtons.removeClass( 'dt-init-replylink-active' );
this.$pageContainer.removeClass( 'dt-init-replylink-open' );
// eslint-disable-next-line no-jquery/no-global-selector
@ -259,7 +259,9 @@ CommentController.prototype.teardown = function () {
}
modifier.removeAddedListItem( this.newListItem );
this.newListItem = null;
this.$replyLink.trigger( 'focus' );
if ( abandoned ) {
this.$replyLink.trigger( 'focus' );
}
};
CommentController.prototype.postReply = function ( parsoidData ) {

7
modules/dt.ui.ReplyWidget.js
View file

@ -316,7 +316,7 @@ ReplyWidget.prototype.tryTeardown = function () {
} );
}
promise.then( function () {
widget.teardown();
widget.teardown( true );
} );
return this;
};
@ -324,16 +324,17 @@ ReplyWidget.prototype.tryTeardown = function () {
/**
* Teardown the widget
*
* @param {boolean} [abandoned] Widget was torn down after a reply was abandoned
* @chainable
* @return {ReplyWidget}
*/
ReplyWidget.prototype.teardown = function () {
ReplyWidget.prototype.teardown = function ( abandoned ) {
this.unbindBeforeUnloadHandler();
this.clear();
this.storage.remove( this.storagePrefix + '/mode' );
this.storage.remove( this.storagePrefix + '/saveable' );
this.$preview.empty();
this.emit( 'teardown' );
this.emit( 'teardown', abandoned );
return this;
};