jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329214 )
Change subject: Use mw.Api.parse() for previewing warnings
......................................................................
Use mw.Api.parse() for previewing warnings
And add the filter id as the second parameter to the message.
Bug: T68351
Change-Id: Iee8ac20d3cc9c0f6340ec6f339b0e51d7c88f976
---
M extension.json
M modules/ext.abuseFilter.edit.js
2 files changed, 25 insertions(+), 16 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index f0e9823..75838ef 100644
--- a/extension.json
+++ b/extension.json
@@ -128,6 +128,7 @@
"dependencies": [
"mediawiki.util",
"mediawiki.api",
+ "mediawiki.api.parse",
"jquery.textSelection",
"jquery.spinner"
]
diff --git a/modules/ext.abuseFilter.edit.js b/modules/ext.abuseFilter.edit.js
index 9fe1110..c5b0577 100644
--- a/modules/ext.abuseFilter.edit.js
+++ b/modules/ext.abuseFilter.edit.js
@@ -188,23 +188,31 @@
}
/**
- * Fetches the selected warning message for previewing
- */
+ * Fetches the selected warning message for previewing
+ */
function previewWarnMessage() {
- $.get(
- mw.config.get( 'wgScript' ), {
- title: 'MediaWiki:' +
getCurrentWarningMessage(),
- action: 'render'
- }
- )
- .done( function( messageHtml ) {
- // Replace $1 with the description of the filter
- messageHtml = messageHtml.replace(
- /\$1/g,
- mw.html.escape( $(
'input[name=wpFilterDescription]' ).val() )
- );
-
- $( '#mw-abusefilter-warn-preview' ).html( messageHtml );
+ var api = new mw.Api(),
+ args = [
+ $( 'input[name=wpFilterDescription]' ).val(),
+ $( '#mw-abusefilter-edit-id'
).children().last().text()
+ ],
+ message = getCurrentWarningMessage();
+ api.get( {
+ action: 'query',
+ meta: 'allmessages',
+ ammessages: message,
+ amargs: args.join( '|' ),
+ } )
+ .done( function( data ) {
+ api.parse( data.query.allmessages[0]['*'], {
+ disablelimitreport: '',
+ preview: '',
+ prop: 'text',
+ title: 'MediaWiki:' + message,
+ } )
+ .done( function( html ) {
+ $( '#mw-abusefilter-warn-preview' ).html( html
);
+ } );
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/329214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee8ac20d3cc9c0f6340ec6f339b0e51d7c88f976
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Huji <[email protected]>
Gerrit-Reviewer: Matěj Suchánek <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
