jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404903 )
Change subject: NewTopicWidget, BoardDescriptionWidget: Don't clear on error
......................................................................
NewTopicWidget, BoardDescriptionWidget: Don't clear on error
When an error occurs, don't try to clear the editor.
It looks like the behavior of chained rejected promises changed somehow
and we were falling from the failure path into the success path.
Bug: T185042
Change-Id: Ic0a9be9b45bf584c7bf2afe5138ade53fef4c13e
---
M modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
M modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
2 files changed, 4 insertions(+), 0 deletions(-)
Approvals:
Esanders: Looks good to me, but someone else must approve
Sbisson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
b/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
index d29f0df..0679e00 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
@@ -251,6 +251,8 @@
widget.error.setLabel( new
OO.ui.HtmlSnippet( errorObj.error && errorObj.error.info || errorObj.exception
) );
widget.error.toggle( true );
}
+ // Prevent the promise from becoming resolved
after this step
+ return $.Deferred().reject().promise();
} )
// Get the new categories
.then( this.api.getCategories.bind( this.api ) )
diff --git a/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
b/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
index 794acc3..6aec6ea 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
@@ -222,6 +222,8 @@
widget.error.setLabel( new
OO.ui.HtmlSnippet( errorObj.error && errorObj.error.info || errorObj.exception
) );
widget.error.toggle( true );
}
+ // Prevent the promise from becoming resolved
after this step
+ return $.Deferred().reject().promise();
} )
.always( function () {
widget.editor.popPending();
--
To view, visit https://gerrit.wikimedia.org/r/404903
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0a9be9b45bf584c7bf2afe5138ade53fef4c13e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Sbisson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
