jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332762 )
Change subject: Replace jshint/jscs with eslint and add stylelint
......................................................................
Replace jshint/jscs with eslint and add stylelint
Change-Id: I9c33c65c913d891739b913d5363abba66c2cd0dd
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
A .stylelintrc
M FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.css
M FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
M Gruntfile.js
M maintenance/GenerateFancyCaptchas.php
M package.json
M resources/ext.confirmEdit.editPreview.ipwhitelist.styles.css
11 files changed, 44 insertions(+), 39 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..4843240
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,10 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "browser": true,
+ "jquery": true
+ },
+ "globals": {
+ "mediaWiki": false
+ }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index 9d22e3f..0000000
--- a/.jscsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "preset": "wikimedia"
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 82eaa05..0000000
--- a/.jshintignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules/**
-vendor/**
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index e1c2afe..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "globals": {
- "mediaWiki": true,
- "jQuery": true
- }
-}
-
diff --git a/.stylelintrc b/.stylelintrc
new file mode 100644
index 0000000..2c90730
--- /dev/null
+++ b/.stylelintrc
@@ -0,0 +1,3 @@
+{
+ "extends": "stylelint-config-wikimedia"
+}
diff --git a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.css
b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.css
index 96e4dd6..3be8933 100644
--- a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.css
+++ b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.css
@@ -1,6 +1,6 @@
.fancycaptcha-wrapper {
display: table;
- background-color: #FFF;
+ background-color: #fff;
}
/* Prevents the size of the container from changing, affecting page
@@ -11,27 +11,28 @@
display: inline-block;
}
-.client-nojs .fancycaptcha-reload {
- display: none;
-}
-
.fancycaptcha-reload {
/* @embed */
- background: url(images/fancycaptcha-reload-icon.png) no-repeat scroll
left center transparent;
+ background: url( images/fancycaptcha-reload-icon.png ) no-repeat scroll
left center transparent;
margin: 0 0 0 3px;
padding: 1px 2px 1px 12px;
- color: #0645AD;
+ color: #0645ad;
cursor: pointer;
cursor: hand;
+}
+
+.client-nojs .fancycaptcha-reload {
+ display: none;
}
.fancycaptcha-reload:hover {
text-decoration: underline;
}
+
.fancycaptcha-reload-loading {
/* @embed */
- background: url(images/ajax-loader-10x10.gif) no-repeat scroll left
center transparent;
+ background: url( images/ajax-loader-10x10.gif ) no-repeat scroll left
center transparent;
}
.fancycaptcha-image-container .fancycaptcha-reload {
diff --git a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
index c010db8..b57b965 100644
--- a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
+++ b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
@@ -42,4 +42,4 @@
return false;
} );
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/Gruntfile.js b/Gruntfile.js
index 4e1660c..97f1b48 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,19 +1,22 @@
-/*jshint node:true */
+/* eslint-env node */
module.exports = function ( grunt ) {
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
+ grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
- jshint: {
+ eslint: {
all: [
'**/*.js',
'!node_modules/**'
]
},
- jscs: {
- src: '<%= jshint.all %>'
+ stylelint: {
+ all: [
+ '**/*.css',
+ '!node_modules/**'
+ ]
},
banana: {
all: [
@@ -30,6 +33,6 @@
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
+ grunt.registerTask( 'test', [ 'eslint', 'stylelint', 'jsonlint',
'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/maintenance/GenerateFancyCaptchas.php
b/maintenance/GenerateFancyCaptchas.php
index b8b5692..bb19d8b 100644
--- a/maintenance/GenerateFancyCaptchas.php
+++ b/maintenance/GenerateFancyCaptchas.php
@@ -27,7 +27,7 @@
$IP = __DIR__.'/../../..';
}
-require_once ( "$IP/maintenance/Maintenance.php" );
+require_once ( "$IP/core/maintenance/Maintenance.php" );
/**
* Maintenance script to change the password of a given user.
diff --git a/package.json b/package.json
index 42a7ab6..2a64d88 100644
--- a/package.json
+++ b/package.json
@@ -4,12 +4,12 @@
"test": "grunt test"
},
"devDependencies": {
- "grunt": "0.4.5",
- "grunt-cli": "0.1.13",
- "grunt-contrib-jshint": "0.11.3",
- "grunt-banana-checker": "0.4.0",
- "grunt-jscs": "2.3.0",
- "jscs-preset-wikimedia": "~1.0.0",
- "grunt-jsonlint": "1.0.7"
+ "eslint-config-wikimedia": "0.3.0",
+ "grunt": "1.0.1",
+ "grunt-eslint": "19.0.0",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-jsonlint": "1.1.0",
+ "grunt-stylelint": "0.6.0",
+ "stylelint-config-wikimedia": "0.3.0"
}
}
diff --git a/resources/ext.confirmEdit.editPreview.ipwhitelist.styles.css
b/resources/ext.confirmEdit.editPreview.ipwhitelist.styles.css
index 9fc8080..b4d4c5c 100644
--- a/resources/ext.confirmEdit.editPreview.ipwhitelist.styles.css
+++ b/resources/ext.confirmEdit.editPreview.ipwhitelist.styles.css
@@ -1,7 +1,7 @@
.mw-confirmedit-ip-notvalid {
- background-color: #FF6C6C;
+ background-color: #ff6c6c;
}
.mw-confirmedit-ip-valid {
- background-color: #90EE90;
+ background-color: #90ee90;
}
--
To view, visit https://gerrit.wikimedia.org/r/332762
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c33c65c913d891739b913d5363abba66c2cd0dd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: 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
