Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235511
Change subject: Fix cancelling of extension inspectors
......................................................................
Fix cancelling of extension inspectors
* Don't insert/update/remove nodes on cancel in MWExtensionInspector
* Don't forget to popStaging on cancel in MWLiveExtensionInspector
Bug: T110992
Change-Id: I1e30206595e304eb502c7e745bf5e00d145d12d7
(cherry picked from commit a02d8573b44219b1671375166e575c3497d47960)
---
M modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
M modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js
2 files changed, 11 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/11/235511/1
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
b/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
index 9d3264f..98b7d69 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
@@ -124,12 +124,14 @@
ve.ui.MWExtensionInspector.prototype.getTeardownProcess = function ( data ) {
return
ve.ui.MWExtensionInspector.super.prototype.getTeardownProcess.call( this, data )
.first( function () {
- if ( this.constructor.static.allowedEmpty ||
this.input.getInnerValue() !== '' ) {
- this.insertOrUpdateNode();
- } else if ( this.selectedNode &&
!this.constructor.static.allowedEmpty ) {
- // Content has been emptied on a node which
isn't allowed to
- // be empty, so delete it.
- this.removeNode();
+ if ( data && data.action === 'done' ) {
+ if ( this.constructor.static.allowedEmpty ||
this.input.getInnerValue() !== '' ) {
+ this.insertOrUpdateNode();
+ } else if ( this.selectedNode &&
!this.constructor.static.allowedEmpty ) {
+ // Content has been emptied on a node
which isn't allowed to
+ // be empty, so delete it.
+ this.removeNode();
+ }
}
}, this );
};
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js
b/modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js
index 3867efa..c9a8807 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js
@@ -64,6 +64,9 @@
return
ve.ui.MWLiveExtensionInspector.super.prototype.getTeardownProcess.call( this,
data )
.first( function () {
this.input.off( 'change', this.onChangeHandler );
+ if ( data === undefined ) { // cancel
+ this.getFragment().getSurface().popStaging();
+ }
}, this );
};
--
To view, visit https://gerrit.wikimedia.org/r/235511
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e30206595e304eb502c7e745bf5e00d145d12d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.26wmf21
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
