Fomafix has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403354 )
Change subject: Use jQuery 3 .catch( fn ) instead of .then( null, fn ) ...................................................................... Use jQuery 3 .catch( fn ) instead of .then( null, fn ) https://api.jquery.com/deferred.catch/ Since jQuery 3 deferred.catch( fn ) is an alias to deferred.then( null, fn ) This improves the readability. Change-Id: I6c032936451d370a045ef9db23dad84a7ff985a7 --- M modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js M modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js M modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js M modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js M modules/messagePoster/ext.flow.messagePoster.js 5 files changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/54/403354/1 diff --git a/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js b/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js index 27f7754..d29f0df 100644 --- a/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js +++ b/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js @@ -245,7 +245,7 @@ widget.$content.empty().append( $.parseHTML( desc.content.content ) ); widget.emit( 'saveContent' ); } ) - .then( null, function ( errorCode, errorObj ) { + .catch( function ( errorCode, errorObj ) { widget.captcha.update( errorCode, errorObj ); if ( !widget.captcha.isRequired() ) { widget.error.setLabel( new OO.ui.HtmlSnippet( errorObj.error && errorObj.error.info || errorObj.exception ) ); diff --git a/modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js b/modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js index f99cf78..861328d 100644 --- a/modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js +++ b/modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js @@ -148,7 +148,7 @@ widget.emit( 'saveContent', workflow, content, format ); } ) - .then( null, function ( errorCode, errorObj ) { + .catch( function ( errorCode, errorObj ) { widget.captcha.update( errorCode, errorObj ); if ( !widget.captcha.isRequired() ) { widget.error.setLabel( new OO.ui.HtmlSnippet( errorObj.error && errorObj.error.info || errorObj.exception ) ); diff --git a/modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js b/modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js index 376a1f4..6888a8b 100644 --- a/modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js +++ b/modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js @@ -150,7 +150,7 @@ widget.emit( 'saveContent', workflow, content, format ); } ) - .then( null, function ( errorCode, errorObj ) { + .catch( function ( errorCode, errorObj ) { widget.captcha.update( errorCode, errorObj ); if ( !widget.captcha.isRequired() ) { widget.error.setLabel( new OO.ui.HtmlSnippet( errorObj.error && errorObj.error.info || errorObj.exception ) ); diff --git a/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js b/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js index eea6ea5..794acc3 100644 --- a/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js +++ b/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js @@ -216,7 +216,7 @@ widget.toggleExpanded( false ); widget.emit( 'save', topicId ); } ) - .then( null, function ( errorCode, errorObj ) { + .catch( function ( errorCode, errorObj ) { widget.captcha.update( errorCode, errorObj ); if ( !widget.captcha.isRequired() ) { widget.error.setLabel( new OO.ui.HtmlSnippet( errorObj.error && errorObj.error.info || errorObj.exception ) ); diff --git a/modules/messagePoster/ext.flow.messagePoster.js b/modules/messagePoster/ext.flow.messagePoster.js index 60d45d7..ce980b5 100644 --- a/modules/messagePoster/ext.flow.messagePoster.js +++ b/modules/messagePoster/ext.flow.messagePoster.js @@ -39,8 +39,7 @@ nttopic: subject, ntcontent: body, ntformat: 'wikitext' - } ).then( - null, // Preserve parameters from postWithToken promise + } ).catch( function ( code, details ) { return $.Deferred().reject( 'api-fail', code, details ); } -- To view, visit https://gerrit.wikimedia.org/r/403354 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c032936451d370a045ef9db23dad84a7ff985a7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Fomafix <foma...@googlemail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
