jenkins-bot has submitted this change and it was merged.
Change subject: Don't error when we try to close a reference/media dialog with
inspectors still open
......................................................................
Don't error when we try to close a reference/media dialog with inspectors still
open
Bug: T96630
Change-Id: Ie148149c9681a883116df12a23ae6e4c3b470daa
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
2 files changed, 2 insertions(+), 0 deletions(-)
Approvals:
Jforrester: Looks good to me, but someone else must approve
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index 54a0b29..762c1f1 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -1197,6 +1197,7 @@
if ( this.imageModel ) {
this.imageModel.disconnect( this );
this.sizeWidget.disconnect( this );
+
this.captionTarget.getSurface().getModel().disconnect( this );
}
this.captionTarget.destroy();
this.captionTarget = null;
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index 4ad2e82..ef50ee9 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -421,6 +421,7 @@
ve.ui.MWReferenceDialog.prototype.getTeardownProcess = function ( data ) {
return ve.ui.MWReferenceDialog.super.prototype.getTeardownProcess.call(
this, data )
.first( function () {
+
this.referenceTarget.getSurface().getModel().disconnect( this );
this.search.getQuery().setValue( '' );
this.referenceTarget.destroy();
this.referenceTarget = null;
--
To view, visit https://gerrit.wikimedia.org/r/227002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie148149c9681a883116df12a23ae6e4c3b470daa
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
