jenkins-bot has submitted this change and it was merged.
Change subject: Add .jshintrc for AbuseFilter and make it pass
......................................................................
Add .jshintrc for AbuseFilter and make it pass
Change-Id: I1cee072e6c751e441e77e6f005676fe13841283e
---
A .jshintrc
M modules/ext.abuseFilter.edit.js
M modules/ext.abuseFilter.examine.js
M modules/ext.abuseFilter.tools.js
4 files changed, 49 insertions(+), 15 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 0000000..1c7e9e1
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,31 @@
+{
+ /* Common */
+
+ // Enforcing
+ "camelcase": true,
+ "curly": true,
+ "eqeqeq": true,
+ "immed": true,
+ "latedef": true,
+ "newcap": true,
+ "noarg": true,
+ "noempty": true,
+ "nonew": true,
+ "quotmark": "single",
+ "trailing": true,
+ "undef": true,
+ "unused": true,
+ // Legacy
+ "onevar": true,
+
+ /* Local */
+
+ // Enforcing
+ // Environment
+ "browser": true,
+
+ "predef": [
+ "mediaWiki",
+ "jQuery"
+ ]
+}
diff --git a/modules/ext.abuseFilter.edit.js b/modules/ext.abuseFilter.edit.js
index 967b4b5..8f178ef 100644
--- a/modules/ext.abuseFilter.edit.js
+++ b/modules/ext.abuseFilter.edit.js
@@ -35,13 +35,13 @@
*/
function doSyntaxCheck() {
/*jshint validthis:true */
- var filter = $filterBox.val();
+ var filter = $filterBox.val(),
+ api = new mw.Api();
$( this )
.attr( 'disabled', 'disabled' )
.injectSpinner( 'abusefilter-syntaxcheck' );
- var api = new mw.Api();
api.get( {
action: 'abusefilterchecksyntax',
filter: filter
@@ -121,7 +121,7 @@
}
$filterBox.textSelection(
- 'encapsulateSelection', { 'pre': $filterBuilder.val() +
" " }
+ 'encapsulateSelection', { 'pre': $filterBuilder.val() +
' ' }
);
$filterBuilder.prop( 'selectedIndex', 0 );
}
@@ -134,7 +134,8 @@
*/
function fetchFilter() {
/*jshint validthis:true */
- var filterId = $( '#mw-abusefilter-load-filter' ).val();
+ var filterId = $( '#mw-abusefilter-load-filter' ).val(),
+ api;
if ( filterId === '' ) {
return;
@@ -143,7 +144,7 @@
$( this ).injectSpinner( 'fetch-spinner' );
// We just ignore errors or unexisting filters over here
- var api = new mw.Api();
+ api = new mw.Api();
api.get( {
action: 'query',
list: 'abusefilters',
@@ -220,13 +221,14 @@
*/
function onFilterGroupChange() {
/*jshint validthis:true */
- var newVal = mw.config.get(
'wgAbuseFilterDefaultWarningMessage' )[$( this ).val()];
+ var $afWarnMessageExisting, $afWarnMessageOther, newVal;
if ( !$( '#mw-abusefilter-action-warn-checkbox' ).is(
':checked' ) ) {
- var $afWarnMessageExisting = $(
'#mw-abusefilter-warn-message-existing' ),
- $afWarnMessageOther = $(
'#mw-abusefilter-warn-message-other' );
+ $afWarnMessageExisting = $(
'#mw-abusefilter-warn-message-existing' );
+ $afWarnMessageOther = $(
'#mw-abusefilter-warn-message-other' );
+ newVal = mw.config.get(
'wgAbuseFilterDefaultWarningMessage' )[$( this ).val()];
- if ( $afWarnMessageExisting.find( "option[value='" +
newVal + "']" ).length ) {
+ if ( $afWarnMessageExisting.find( 'option[value=\'' +
newVal + '\']' ).length ) {
$afWarnMessageExisting.val( newVal );
$afWarnMessageOther.val( '' );
} else {
diff --git a/modules/ext.abuseFilter.examine.js
b/modules/ext.abuseFilter.examine.js
index 6b4b87a..2e55564 100644
--- a/modules/ext.abuseFilter.examine.js
+++ b/modules/ext.abuseFilter.examine.js
@@ -25,7 +25,8 @@
params = {
action: 'abusefiltercheckmatch',
filter: filter
- };
+ },
+ api = new mw.Api();
$( this ).injectSpinner( 'filter-check' );
@@ -36,7 +37,6 @@
}
// Use post due to the rather large amount of data
- var api = new mw.Api();
api.post( params )
.done( examinerTestProcess )
.fail( examinerTestProcessFailure );
diff --git a/modules/ext.abuseFilter.tools.js b/modules/ext.abuseFilter.tools.js
index f47b5fc..f0b0e43 100644
--- a/modules/ext.abuseFilter.tools.js
+++ b/modules/ext.abuseFilter.tools.js
@@ -15,10 +15,10 @@
*/
function doExprSubmit() {
/*jshint validthis:true */
- var expr = $( '#wpTestExpr' ).val();
+ var expr = $( '#wpTestExpr' ).val(),
+ api = new mw.Api();
$( this ).injectSpinner( 'abusefilter-expr' );
- var api = new mw.Api();
api.get( {
action: 'abusefilterevalexpression',
expression: expr
@@ -44,7 +44,8 @@
*/
function doReautoSubmit() {
/*jshint validthis:true */
- var name = $( '#reautoconfirm-user' ).val();
+ var name = $( '#reautoconfirm-user' ).val(),
+ api;
if ( name === '' ) {
return;
@@ -52,7 +53,7 @@
$( this ).injectSpinner( 'abusefilter-reautoconfirm' );
- var api = new mw.Api();
+ api = new mw.Api();
api.post( {
action: 'abusefilterunblockautopromote',
user: name,
--
To view, visit https://gerrit.wikimedia.org/r/59618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1cee072e6c751e441e77e6f005676fe13841283e
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Hoo man <[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
