jenkins-bot has submitted this change and it was merged.

Change subject: Update some packages
......................................................................


Update some packages

Update grunt-jsonlint to 1.0.7

Update grunt-contrib-jshint to 1.0.0

Also add .jshintrc.

Change-Id: I274c8d111cfc29d4bed0bbc0004c179b2f31e804
---
A .jshintrc
M Gruntfile.js
M javascripts/specialpages/ext.GoogleLogin.specialManage.js
M package.json
4 files changed, 27 insertions(+), 4 deletions(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 0000000..687fe80
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,24 @@
+{
+       // Enforcing
+       "bitwise": true,
+       "eqeqeq": true,
+       "freeze": true,
+       "latedef": "nofunc",
+       "noarg": true,
+       "nonew": true,
+       "undef": true,
+       "unused": true,
+       "strict": false,
+
+       // Relaxing
+       "es5": false,
+
+       // Environment
+       "browser": true,
+       "jquery": true,
+
+       "globals": {
+               "mediaWiki": false,
+               "OO": false
+       }
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index adbc79e..82df46e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -18,7 +18,6 @@
                },
                jsonlint: {
                        all: [
-                               '*.json',
                                '**/*.json',
                                '!node_modules/**'
                        ]
diff --git a/javascripts/specialpages/ext.GoogleLogin.specialManage.js 
b/javascripts/specialpages/ext.GoogleLogin.specialManage.js
index 8589eca..21c8e87 100644
--- a/javascripts/specialpages/ext.GoogleLogin.specialManage.js
+++ b/javascripts/specialpages/ext.GoogleLogin.specialManage.js
@@ -164,7 +164,7 @@
        // Append the window manager.
        $( 'body' ).append( windowManager.$element );
 
-       $( '.googlelogin-googleid' ).toggleClass( 'hidden' ).on( 'click', 
function ( ev ) {
+       $( '.googlelogin-googleid' ).toggleClass( 'hidden' ).on( 'click', 
function () {
                mw.GoogleLogin.showInfoDialog( $( this ).data( 'googleid' ) );
        } );
 }( mediaWiki ) );
\ No newline at end of file
diff --git a/package.json b/package.json
index 0beff59..aa96988 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
   "devDependencies": {
     "grunt": "0.4.5",
     "grunt-cli": "0.1.13",
-    "grunt-contrib-jshint": "0.11.3",
+    "grunt-contrib-jshint": "1.0.0",
     "grunt-banana-checker": "0.4.0",
-    "grunt-jsonlint": "1.0.5"
+    "grunt-jsonlint": "1.0.7"
   }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/275460
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I274c8d111cfc29d4bed0bbc0004c179b2f31e804
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/GoogleLogin
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to