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

Merge "ReplyWidget: Ignore pending updates after tearing down"

Browse source
This commit is contained in:
jenkins-bot 2022-09-03 20:23:22 +00:00 committed by Gerrit Code Review
parent 2ce1822484 9b317c6f22
commit cb4eb9f9e9
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,7 @@ function ReplyWidget( commentController, commentDetails, config ) {
ReplyWidget.super.call( this, config );
this.pending = false;
this.isTornDown = false;
this.commentController = commentController;
var threadItem = commentController.getThreadItem();
this.commentDetails = commentDetails;
@ -362,7 +363,7 @@ ReplyWidget.prototype.getMode = null;
* Restore the widget to its original state
*
* Clear any widget values, reset UI states, and clear
* any (optionall) auto-save values.
* any (optional) auto-save values.
*
* @param {boolean} [preserveStorage] Preserve auto-save storage
*/
@ -371,6 +372,10 @@ ReplyWidget.prototype.clear = function ( preserveStorage ) {
this.saveErrorMessage.$element.remove();
this.saveErrorMessage = null;
}
if ( this.previewRequest ) {
this.previewRequest.abort();
this.previewRequest = null;
}
this.$preview.empty();
this.previewWikitext = null;
this.previewTitle = null;
@ -705,6 +710,9 @@ ReplyWidget.prototype.tryTeardown = function () {
* @return {ReplyWidget}
*/
ReplyWidget.prototype.teardown = function ( mode ) {
// Call the change handler to save the current value in auto-save
this.onInputChange();
if ( this.isNewTopic ) {
this.commentController.sectionTitle.disconnect( this );
}
@ -720,6 +728,7 @@ ReplyWidget.prototype.teardown = function ( mode ) {
}
mw.hook( 'wikipage.watchlistChange' ).remove( this.onWatchToggleHandler );
this.isTornDown = true;
this.clear( mode === 'refresh' );
this.emit( 'teardown', mode );
return this;
@ -772,6 +781,11 @@ ReplyWidget.prototype.onKeyDown = function ( isMultiline, e ) {
* Handle input change events anywhere in the reply widget
*/
ReplyWidget.prototype.onInputChange = function () {
if ( this.isTornDown ) {
// Ignore calls after teardown, which would clear the auto-save or crash
return;
}
this.updateButtons();
this.storage.set( this.storagePrefix + '/saveable', this.isEmpty() ? '' : '1' );
this.preparePreview();

5
modules/dt.ui.ReplyWidgetPlain.js
View file

@ -117,6 +117,11 @@ ReplyWidgetPlain.prototype.getMode = function () {
* @inheritdoc
*/
ReplyWidgetPlain.prototype.onInputChange = function () {
if ( this.isTornDown ) {
// Ignore calls after teardown, which would clear the auto-save or crash
return;
}
// Parent method
ReplyWidgetPlain.super.prototype.onInputChange.apply( this, arguments );