Skip to content

Commit b6bce05

Browse files
freddenfredden
committed
Update existing files to match new coding standard
1 parent 1edeb6d commit b6bce05

10 files changed

+130
-124
lines changed

‎eslint/rules/jquery-no-andSelf.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ module.exports = {
55
description: 'Disallow the use of the deprecated `andSelf` method',
66
category: 'jQuery deprecated functions',
77
recommended: true,
8-
url: 'https://api.jquery.com/andself/'
8+
url: 'https://api.jquery.com/andself/',
99
},
1010
schema: [],
1111
messages: {
12-
andSelf: 'jQuery.andSelf() removed, use jQuery.addBack()'
13-
}
12+
andSelf: 'jQuery.andSelf() removed, use jQuery.addBack()',
13+
},
1414
},
1515

1616
/**
@@ -22,7 +22,7 @@ module.exports = {
2222
create: function (context) {
2323
'use strict';
2424

25-
var utils = require('./utils.js');
25+
const utils = require('./utils.js');
2626

2727
return {
2828
/**
@@ -31,17 +31,17 @@ module.exports = {
3131
* @param {Object} node - The node to check.
3232
*/
3333
CallExpression: function (node) {
34-
if (node.callee.type !== 'MemberExpression') {return;}
34+
if (node.callee.type !== 'MemberExpression') { return; }
3535

36-
if (node.callee.property.name !== 'andSelf') {return;}
36+
if (node.callee.property.name !== 'andSelf') { return; }
3737

3838
if (utils.isjQuery(node)) {
3939
context.report({
4040
node: node,
41-
messageId: 'andSelf'
41+
messageId: 'andSelf',
4242
});
4343
}
44-
}
44+
},
4545
};
46-
}
46+
},
4747
};

‎eslint/rules/jquery-no-bind-unbind.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ module.exports = {
55
description: 'Disallow the use of the deprecated $.bind and $.unbind',
66
category: 'jQuery deprecated functions',
77
recommended: true,
8-
url: 'https://api.jquery.com/bind/'
8+
url: 'https://api.jquery.com/bind/',
99
},
1010
schema: [],
1111
messages: {
12-
bind: 'jQuery $.bind and $.unbind are deprecated, use $.on and $.off instead'
13-
}
12+
bind: 'jQuery $.bind and $.unbind are deprecated, use $.on and $.off instead',
13+
},
1414
},
1515

1616
/**
@@ -22,7 +22,7 @@ module.exports = {
2222
create: function (context) {
2323
'use strict';
2424

25-
var utils = require('./utils.js');
25+
const utils = require('./utils.js');
2626

2727
return {
2828
/**
@@ -31,17 +31,17 @@ module.exports = {
3131
* @param {Object} node - The node to check.
3232
*/
3333
CallExpression: function (node) {
34-
if (node.callee.type !== 'MemberExpression') {return;}
34+
if (node.callee.type !== 'MemberExpression') { return; }
3535

36-
if (!['bind', 'unbind'].includes(node.callee.property.name)) {return;}
36+
if (!['bind', 'unbind'].includes(node.callee.property.name)) { return; }
3737

3838
if (utils.isjQuery(node)) {
3939
context.report({
4040
node: node,
41-
messageId: 'bind'
41+
messageId: 'bind',
4242
});
4343
}
44-
}
44+
},
4545
};
46-
}
46+
},
4747
};

‎eslint/rules/jquery-no-delegate-undelegate.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ module.exports = {
55
description: 'Disallow the use of the deprecated $.delegate and $.undelegate',
66
category: 'jQuery deprecated functions',
77
recommended: true,
8-
url: 'https://api.jquery.com/delegate/'
8+
url: 'https://api.jquery.com/delegate/',
99
},
1010
schema: [],
1111
messages: {
12-
delegate: 'jQuery $.delegate and $.undelegate are deprecated, use $.on and $.off instead'
13-
}
12+
delegate: 'jQuery $.delegate and $.undelegate are deprecated, use $.on and $.off instead',
13+
},
1414
},
1515

1616
/**
@@ -22,7 +22,7 @@ module.exports = {
2222
create: function (context) {
2323
'use strict';
2424

25-
var utils = require('./utils.js');
25+
const utils = require('./utils.js');
2626

2727
return {
2828
/**
@@ -31,17 +31,17 @@ module.exports = {
3131
* @param {Object} node - The node to check.
3232
*/
3333
CallExpression: function (node) {
34-
if (node.callee.type !== 'MemberExpression') {return;}
34+
if (node.callee.type !== 'MemberExpression') { return; }
3535

36-
if (!['delegate', 'undelegate'].includes(node.callee.property.name)) {return;}
36+
if (!['delegate', 'undelegate'].includes(node.callee.property.name)) { return; }
3737

3838
if (utils.isjQuery(node)) {
3939
context.report({
4040
node: node,
41-
messageId: 'delegate'
41+
messageId: 'delegate',
4242
});
4343
}
44-
}
44+
},
4545
};
46-
}
46+
},
4747
};

‎eslint/rules/jquery-no-deprecated-expr.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ module.exports = {
55
description: 'Disallow the use of deprecated way to add to custom selectors',
66
category: 'jQuery deprecated functions',
77
recommended: true,
8-
url: 'https://api.jquery.com/load/'
8+
url: 'https://api.jquery.com/load/',
99
},
10-
schema: []
10+
schema: [],
1111
},
1212

1313
/**
@@ -19,7 +19,7 @@ module.exports = {
1919
create: function (context) {
2020
'use strict';
2121

22-
var utils = require('./utils.js');
22+
const utils = require('./utils.js');
2323

2424
return {
2525
/**
@@ -31,7 +31,7 @@ module.exports = {
3131
if (utils.isjQuery(node)) {
3232
context.report({
3333
node: node,
34-
message: 'jQuery.expr[":"] is deprecated; Use jQuery.expr.pseudos instead'
34+
message: 'jQuery.expr[":"] is deprecated; Use jQuery.expr.pseudos instead',
3535
});
3636
}
3737
},
@@ -45,10 +45,10 @@ module.exports = {
4545
if (utils.isjQuery(node)) {
4646
context.report({
4747
node: node,
48-
message: 'jQuery.expr.filters is deprecated; Use jQuery.expr.pseudos instead'
48+
message: 'jQuery.expr.filters is deprecated; Use jQuery.expr.pseudos instead',
4949
});
5050
}
51-
}
51+
},
5252
};
53-
}
53+
},
5454
};

‎eslint/rules/jquery-no-event-shorthand.js

+16-16
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ module.exports = {
55
description: 'Disallow the use of shorthand event methods',
66
category: 'jQuery deprecated functions',
77
recommended: true,
8-
url: 'https://api.jquery.com/load/'
8+
url: 'https://api.jquery.com/load/',
99
},
10-
schema: []
10+
schema: [],
1111
},
1212

1313
/**
@@ -19,7 +19,7 @@ module.exports = {
1919
create: function (context) {
2020
'use strict';
2121

22-
var utils = require('./utils.js');
22+
const utils = require('./utils.js');
2323

2424
return {
2525
/**
@@ -28,26 +28,26 @@ module.exports = {
2828
* @param {Object} node - The node to check.
2929
*/
3030
CallExpression: function (node) {
31-
var namesToMsg = {
32-
'unload': 'jQuery.unload() was removed, use .on("unload", fn) instead.',
33-
'ready': 'jQuery.ready(handler) is deprecated and should be replaced with jQuery(handler)'
34-
},
35-
name,
36-
message;
31+
const namesToMsg = {
32+
unload: 'jQuery.unload() was removed, use .on("unload", fn) instead.',
33+
ready: 'jQuery.ready(handler) is deprecated and should be replaced with jQuery(handler)',
34+
};
3735

38-
if (node.callee.type !== 'MemberExpression') {return;}
36+
if (node.callee.type !== 'MemberExpression') { return; }
3937

40-
name = node.callee.property.name;
41-
if (!namesToMsg.hasOwnProperty(name)) {return;}
42-
message = namesToMsg[name];
38+
const name = node.callee.property.name;
39+
40+
if (!Object.prototype.hasOwnProperty.call(namesToMsg, name)) { return; }
41+
42+
const message = namesToMsg[name];
4343

4444
if (utils.isjQuery(node)) {
4545
context.report({
4646
node: node,
47-
message: message
47+
message: message,
4848
});
4949
}
50-
}
50+
},
5151
};
52-
}
52+
},
5353
};

‎eslint/rules/jquery-no-input-event-shorthand.js

+12-13
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ module.exports = {
55
description: 'Disallow the use of shortcuts to input events via keyboard/mouse trigger events',
66
category: 'jQuery deprecated functions',
77
recommended: true,
8-
url: 'https://api.jquery.com/bind/'
8+
url: 'https://api.jquery.com/bind/',
99
},
10-
schema: []
10+
schema: [],
1111
},
1212

1313
/**
@@ -19,7 +19,7 @@ module.exports = {
1919
create: function (context) {
2020
'use strict';
2121

22-
var utils = require('./utils.js');
22+
const utils = require('./utils.js');
2323

2424
return {
2525
/**
@@ -28,25 +28,24 @@ module.exports = {
2828
* @param {Object} node - The node to check.
2929
*/
3030
CallExpression: function (node) {
31-
var names, name;
32-
33-
names = ['blur', 'focus', 'focusin', 'focusout', 'resize', 'scroll', 'dblclick', 'mousedown',
34-
'mouseup', 'mousemove','mouseover', 'mouseout', 'mouseenter', 'mouseleave', 'change', 'select',
31+
const names = ['blur', 'focus', 'focusin', 'focusout', 'resize', 'scroll', 'dblclick', 'mousedown',
32+
'mouseup', 'mousemove', 'mouseover', 'mouseout', 'mouseenter', 'mouseleave', 'change', 'select',
3533
'submit', 'keydown', 'keypress', 'keyup', 'contextmenu', 'click'];
3634

37-
if (node.callee.type !== 'MemberExpression') {return;}
35+
if (node.callee.type !== 'MemberExpression') { return; }
3836

39-
if (!names.includes(node.callee.property.name)) {return;}
37+
if (!names.includes(node.callee.property.name)) { return; }
4038

4139
if (utils.isjQuery(node)) {
42-
name = node.callee.property.name;
40+
const name = node.callee.property.name;
41+
4342
context.report({
4443
node: node,
4544
message: 'Instead of .' + name + '(fn) use .on("' + name + '", fn). Instead of .' + name +
46-
'() use .trigger("' + name + '")'
45+
'() use .trigger("' + name + '")',
4746
});
4847
}
49-
}
48+
},
5049
};
51-
}
50+
},
5251
};

‎eslint/rules/jquery-no-misc-deprecated-functions.js

+24-24
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ module.exports = {
55
description: 'Disallow the use of various deprecated methods methods',
66
category: 'jQuery deprecated functions',
77
recommended: true,
8-
url: 'https://api.jquery.com/load/'
8+
url: 'https://api.jquery.com/load/',
99
},
10-
schema: []
10+
schema: [],
1111
},
1212

1313
/**
@@ -19,7 +19,7 @@ module.exports = {
1919
create: function (context) {
2020
'use strict';
2121

22-
var utils = require('./utils.js');
22+
const utils = require('./utils.js');
2323

2424
return {
2525
/**
@@ -28,32 +28,32 @@ module.exports = {
2828
* @param {Object} node - The node to check.
2929
*/
3030
CallExpression: function (node) {
31-
var namesToMsg = {
32-
'isFunction': 'jQuery.isFunction() is deprecated. '
33-
+ 'In most cases, it can be replaced by [typeof x === "function"]',
34-
'type': 'jQuery.type() is deprecated. ' +
35-
'Replace with an appropriate type check like [typeof x === "function"]',
36-
'isArray': 'jQuery.isArray() is deprecated. ' +
37-
'Use the native Array.isArray method instead',
38-
'parseJSON' : 'jQuery.parseJSON() is deprecated. ' +
39-
'To parse JSON strings, use the native JSON.parse method instead'
40-
},
41-
name,
42-
message;
43-
44-
if (node.callee.type !== 'MemberExpression') {return;}
45-
46-
name = node.callee.property.name;
47-
if (!namesToMsg.hasOwnProperty(name)) {return;}
48-
message = namesToMsg[name];
31+
const namesToMsg = {
32+
isFunction: 'jQuery.isFunction() is deprecated. ' +
33+
'In most cases, it can be replaced by [typeof x === "function"]',
34+
type: 'jQuery.type() is deprecated. ' +
35+
'Replace with an appropriate type check like [typeof x === "function"]',
36+
isArray: 'jQuery.isArray() is deprecated. ' +
37+
'Use the native Array.isArray method instead',
38+
parseJSON: 'jQuery.parseJSON() is deprecated. ' +
39+
'To parse JSON strings, use the native JSON.parse method instead',
40+
};
41+
42+
if (node.callee.type !== 'MemberExpression') { return; }
43+
44+
const name = node.callee.property.name;
45+
46+
if (!Object.prototype.hasOwnProperty.call(namesToMsg, name)) { return; }
47+
48+
const message = namesToMsg[name];
4949

5050
if (utils.isjQuery(node)) {
5151
context.report({
5252
node: node,
53-
message: message
53+
message: message,
5454
});
5555
}
56-
}
56+
},
5757
};
58-
}
58+
},
5959
};

0 commit comments

Comments
 (0)