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

Merge "Fix <escape> handler again"

Browse source
This commit is contained in:
jenkins-bot 2020-01-14 15:42:17 +00:00 committed by Gerrit Code Review
parent 7bb23482bd cc5976e8db
commit d6874dcbab
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,7 @@ function ReplyWidget( comment, config ) {
// Events // Events
this.replyButton.connect( this, { click: 'onReplyClick' } ); this.replyButton.connect( this, { click: 'onReplyClick' } );
this.cancelButton.connect( this, { click: [ 'teardown', true ] } ); this.cancelButton.connect( this, { click: 'tryTeardown' } );
this.$element.on( 'keydown', this.onKeyDown.bind( this ) ); this.$element.on( 'keydown', this.onKeyDown.bind( this ) );
this.beforeUnloadHandler = this.onBeforeUnload.bind( this ); this.beforeUnloadHandler = this.onBeforeUnload.bind( this );
@ -112,10 +112,11 @@ ReplyWidget.prototype.setup = function () {
this.bindBeforeUnloadHandler(); this.bindBeforeUnloadHandler();
}; };
ReplyWidget.prototype.teardown = function ( confirm ) { ReplyWidget.prototype.tryTeardown = function () {
var promise, var promise,
widget = this; widget = this;
if ( confirm && !this.isEmpty() ) {
if ( !this.isEmpty() ) {
// TODO: Override messages in dialog to be more ReplyWidget specific // TODO: Override messages in dialog to be more ReplyWidget specific
promise = OO.ui.getWindowManager().openWindow( 'abandonedit' ) promise = OO.ui.getWindowManager().openWindow( 'abandonedit' )
.closed.then( function ( data ) { .closed.then( function ( data ) {
@ -127,16 +128,20 @@ ReplyWidget.prototype.teardown = function ( confirm ) {
promise = $.Deferred().resolve().promise(); promise = $.Deferred().resolve().promise();
} }
promise.then( function () { promise.then( function () {
widget.unbindBeforeUnloadHandler(); widget.teardown();
widget.clear();
widget.$preview.empty();
widget.emit( 'teardown' );
} ); } );
}; };
ReplyWidget.prototype.teardown = function () {
this.unbindBeforeUnloadHandler();
this.clear();
this.$preview.empty();
this.emit( 'teardown' );
};
ReplyWidget.prototype.onKeyDown = function ( e ) { ReplyWidget.prototype.onKeyDown = function ( e ) {
if ( e.which === OO.ui.Keys.ESCAPE ) { if ( e.which === OO.ui.Keys.ESCAPE ) {
this.emit( 'teardown' ); this.tryTeardown();
return false; return false;
} }
}; };