jenkins-bot has submitted this change and it was merged.
Change subject: Unbreak meta dialog cancel button
......................................................................
Unbreak meta dialog cancel button
Don't try to apply page settings changes to meta list unless we're actually
applying. "Cancel" shouldn't apply changes, we have another button for that.
Bug: T97682
Change-Id: I9eae20c3946b315413340268e44537cdbec2e455
---
M modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
M modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
3 files changed, 14 insertions(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
index 28f6524..5d90ec0 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
@@ -258,6 +258,9 @@
ve.ui.MWAdvancedSettingsPage.prototype.teardown = function ( data ) {
// Data initialization
data = data || {};
+ if ( data.action !== 'apply' ) {
+ return;
+ }
var // Indexing items
currentIndexingItem = this.getMetaItem( 'mwIndex' ),
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
index e26e343..e0e58cf 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
@@ -264,8 +264,10 @@
/**
* Tear down the page. This is called when the MWMetaDialog is torn down.
+ *
+ * @param {Object} [data] Dialog tear down data
*/
-ve.ui.MWCategoriesPage.prototype.teardown = function () {
+ve.ui.MWCategoriesPage.prototype.teardown = function ( data ) {
var currentDefaultSortKeyItem = this.getDefaultSortKeyItem(),
newDefaultSortKey = this.defaultSortInput.getValue(),
newDefaultSortKeyData = {
@@ -273,6 +275,11 @@
attributes: { content: newDefaultSortKey }
};
+ data = data || {};
+ if ( data.action !== 'apply' ) {
+ return;
+ }
+
// Alter the default sort key iff it's been touched & is actually
different
if ( this.defaultSortKeyTouched ) {
if ( newDefaultSortKey === '' ) {
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
index 3ac4f37..bb8ee40 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
@@ -278,6 +278,9 @@
ve.ui.MWSettingsPage.prototype.teardown = function ( data ) {
// Data initialisation
data = data || {};
+ if ( data.action !== 'apply' ) {
+ return;
+ }
var // Table of Contents items
tableOfContentsMetaItem = this.getMetaItem( 'mwTOC' ),
--
To view, visit https://gerrit.wikimedia.org/r/228174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9eae20c3946b315413340268e44537cdbec2e455
Gerrit-PatchSet: 3
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
