Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323436
Change subject: Add jshint fix js
......................................................................
Add jshint fix js
Bug: T63632
Change-Id: I7e12a95a66f05403c6eb19d186e5359deb2734ac
---
A .jshintignore
A .jshintrc
M Gruntfile.js
M package.json
M resources/jquery.instantImage.js
M resources/sii.instantImage.js
6 files changed, 52 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticImageInput
refs/changes/36/323436/1
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 0000000..3c3629e
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1 @@
+node_modules
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 0000000..04c3a97
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,23 @@
+{
+ // 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
+ }
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index 001f858..36b6671 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,8 +1,19 @@
+/*jshint node:true */
module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.initConfig( {
+ jshint: {
+ options: {
+ jshintrc: true
+ },
+ all: [
+ '**/*.js',
+ '!node_modules/**'
+ ]
+ },
banana: {
all: 'i18n/'
},
@@ -14,6 +25,6 @@
}
} );
- grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/package.json b/package.json
index 9186399..414bb95 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
"devDependencies": {
"grunt": "1.0.1",
"grunt-banana-checker": "0.5.0",
+ "grunt-contrib-jshint": "1.0.0",
"grunt-jsonlint": "1.1.0"
}
}
diff --git a/resources/jquery.instantImage.js b/resources/jquery.instantImage.js
index ff37bfe..7d0921c 100644
--- a/resources/jquery.instantImage.js
+++ b/resources/jquery.instantImage.js
@@ -7,7 +7,8 @@
* @author Jeroen De Dauw <jeroendedauw at gmail dot com>
*/
-(function( $, mw ) { $.fn.instantImage = function( options ) {
+( function( $ ) {
+ $.fn.instantImage = function( options ) {
var settings = $.extend( {
'imagename': 'Beatles',
@@ -57,6 +58,7 @@
},
function( data ) {
var imgNames = [];
+ var pageid;
if ( data.query && data.query.pages ) {
for ( pageid in
data.query.pages ) {
@@ -80,6 +82,7 @@
};
this.getRaw = function( callback ) {
+ var pageWikiID;
$.getJSON(
settings.apipath,
{
@@ -143,6 +146,8 @@
'iiurlwidth': settings.imagewidth
},
function( data ) {
+ var p;
+ var i;
if ( data.query && data.query.pages ) {
var pages = data.query.pages;
@@ -168,7 +173,7 @@
);
};
- this.dispReqResult = function( images ) {
+ this.dispReqResult = function() {
if ( !_this.loadedFirstReq ) {
_this.loadedFirstReq = true;
}
@@ -206,4 +211,5 @@
this.init();
} );
-}; })( window.jQuery, window.mediaWiki );
+};
+}( jQuery, mediaWiki ) );
diff --git a/resources/sii.instantImage.js b/resources/sii.instantImage.js
index c1aa054..6aa5260 100644
--- a/resources/sii.instantImage.js
+++ b/resources/sii.instantImage.js
@@ -7,8 +7,10 @@
* @author Jeroen De Dauw <jeroendedauw at gmail dot com>
*/
-(function( $, mw ) {
-
+( function( $ ) {
+
+ var $e;
+
$( document ).ready( function() {
// Find all instant image inputs in the form.
$( '.instantImage' ).each( function( index, domElement ) {
@@ -38,6 +40,7 @@
var $this = $( this );
setTimeout(
function() {
+ var $t;
$t = $this.closest( 'fieldset' ).find(
'.multipleTemplateInstance' ).last();
$e = $t.find( '.instantImage' ).first();
@@ -52,4 +55,4 @@
} );
} );
-})( window.jQuery, window.mediaWiki );
\ No newline at end of file
+}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/323436
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e12a95a66f05403c6eb19d186e5359deb2734ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticImageInput
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
