jenkins-bot has submitted this change and it was merged. Change subject: ArticleTarget: Use an OOUI MessageDialog, not window.alert() ......................................................................
ArticleTarget: Use an OOUI MessageDialog, not window.alert() We should avoid using alert()s as much as possible due to their unhealthy interaction patterns with any other open tabs or user tasks. Change-Id: Ib6a217c988322ad17bc7e649c3281eb053b54bbc --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js M modules/ve-mw/init/ve.init.mw.ArticleTarget.js 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js index 0bf1b7f..216b3d2 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js +++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js @@ -907,7 +907,7 @@ // Parent method ve.init.mw.DesktopArticleTarget.super.prototype.serializeFail.apply( this, arguments ); - alert( ve.msg( 'visualeditor-serializeerror', status ) ); + OO.ui.alert( ve.msg( 'visualeditor-serializeerror', status ) ); this.getSurface().getDialogs().closeWindow( 'wikitextswitchconfirm' ); this.resetDocumentOpacity(); diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js index 5a8ad14..b6908ad 100644 --- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js +++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js @@ -673,7 +673,8 @@ this.diffing = false; this.emit( 'showChangesError' ); - alert( ve.msg( 'visualeditor-differror', status ) ); + OO.ui.alert( ve.msg( 'visualeditor-differror', status ) ); + this.saveDialog.popPending(); }; -- To view, visit https://gerrit.wikimedia.org/r/224216 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib6a217c988322ad17bc7e649c3281eb053b54bbc Gerrit-PatchSet: 7 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Bartosz DziewoĆski <matma....@gmail.com> Gerrit-Reviewer: Esanders <esand...@wikimedia.org> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits