jenkins-bot has submitted this change and it was merged.
Change subject: mw.ViewPageTarget: Show AbuseFilter warning in save dialog
......................................................................
mw.ViewPageTarget: Show AbuseFilter warning in save dialog
Misc:
* Updated signature of #showMessage to include allowing
an array of nodes to be passed. We pass this to jQuery#append
so we're just extending the explicitly documented subset of
things it could already do due to passing to jQuery#append.
Bug: 50472
Change-Id: I3f56820a4f14b0684bfa265e3eb5e3820f2a3513
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 16 insertions(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 07315dc..2558e4e 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -469,6 +469,20 @@
return;
}
+ // Handle warnings/errors from Extension:AbuseFilter
+ // TODO: Move this to a plugin
+ if ( editApi.info && editApi.info.indexOf( 'Hit AbuseFilter:' ) === 0
&& editApi.warning ) {
+ this.showMessage(
+ 'api-save-error',
+ $.parseHTML( editApi.warning ),
+ { wrap: false }
+ );
+ // Don't disable the save button. If the action is not
disallowed the user may save the
+ // edit by pressing Save again. The AbuseFilter API currently
has no way to distinguish
+ // between filter triggers that are and aren't disallowing the
action.
+ return;
+ }
+
// Handle token errors
if ( data.error && data.error.code === 'badtoken' ) {
api = new mw.Api();
@@ -2124,7 +2138,8 @@
* Show a message in the save dialog.
*
* @param {string} name Message's unique name
- * @param {string|jQuery} message Message content (string of HTML or jQuery
object)
+ * @param {string|jQuery|Array} message Message content (string of HTML,
jQuery object or array of
+ * Node objects)
* @param {Object} [options]
* @param {boolean} [options.wrap="warning"] Whether to wrap the message in a
paragraph and if
* so, how. One of "warning", "error" or false.
--
To view, visit https://gerrit.wikimedia.org/r/74102
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f56820a4f14b0684bfa265e3eb5e3820f2a3513
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
