Skip to content

Commit 6cdc855

Browse files
loginestaloginesta
committed
Run JSCS against eslint/rules/ and Magento2/
1 parent 72bd288 commit 6cdc855

17 files changed

+379
-256
lines changed

‎Magento2/Tests/Eslint/AndSelfTest.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
$(document).ready(function() {
1+
$(document).ready(function () {
22
'use strict';
3-
$("div").find("p").andSelf().addClass("border");
4-
});
3+
4+
$('div').find('p').andSelf().addClass('border');
5+
});

‎Magento2/Tests/Eslint/BindUnbindTest.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
$(document).ready(function(){
1+
$(document).ready(function () {
22
'use strict';
3-
$(".btn1").bind("click");
4-
});
3+
4+
$('.btn1').bind('click');
5+
});

‎Magento2/Tests/Eslint/ClickEventShorthandTest.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
$(document).ready(function(){
1+
$(document).ready(function () {
22
'use strict';
3-
$("input").blur();
4-
});
3+
4+
$('input').blur();
5+
});

‎Magento2/Tests/Eslint/DelegateUndelegateTest.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
$(document).ready(function(){
1+
$(document).ready(function () {
22
'use strict';
3-
$( "table" ).delegate( "td", "click", function() {
4-
$( this ).toggleClass( "chosen" );
3+
4+
$('table').delegate('td', 'click', function () {
5+
$(this).toggleClass('chosen');
56
});
6-
});
7+
});

‎Magento2/Tests/Eslint/EventShorthandTest.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
$(document).ready(function(){
1+
$(document).ready(function () {
22
'use strict';
3-
$( "#result" ).load( "ajax/test.html" );
4-
});
3+
4+
$('#result').load('ajax/test.html');
5+
});

‎Magento2/Tests/Eslint/SizeTest.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
$(document).ready(function(){
1+
$(document).ready(function () {
22
'use strict';
3-
$("div").size();
4-
});
3+
4+
$('div').size();
5+
});

‎Magento2/Tests/Eslint/TrimTest.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
$(document).ready(function(){
1+
$(document).ready(function () {
22
'use strict';
3-
$.trim(" hello, how are you? ");
4-
});
3+
4+
$.trim(' hello, how are you? ');
5+
});

‎Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.2.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
define([
77
'jquery'
8-
], function (){
8+
], function () {
99
'use strict';
10-
});
10+
11+
});

‎Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.4.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
define([
77
'jquery'
8-
], function (){
8+
], function () {
99
'use strict';
10-
});
10+
11+
});

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

+43-28
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,49 @@
11
module.exports = {
2-
meta: {
3-
type: 'suggestion',
4-
docs: {
5-
description: 'Disallow the use of the deprecated `andSelf` method',
6-
category: 'jQuery deprecated functions',
7-
recommended: true,
8-
url: 'https://api.jquery.com/andself/'
2+
meta: {
3+
type: 'suggestion',
4+
docs: {
5+
description: 'Disallow the use of the deprecated `andSelf` method',
6+
category: 'jQuery deprecated functions',
7+
recommended: true,
8+
url: 'https://api.jquery.com/andself/'
9+
},
10+
schema: [],
11+
messages: {
12+
andSelf: 'jQuery.andSelf() removed, use jQuery.addBack()'
13+
}
914
},
10-
schema: [],
11-
messages: {
12-
andSelf: 'jQuery.andSelf() removed, use jQuery.addBack()'
13-
}
14-
},
1515

16-
create: function(context) {
17-
'use strict';
18-
var utils = require('./utils.js');
16+
/**
17+
* Executes the function to check if andSelf is used.
18+
*
19+
* @param {Object} context
20+
* @returns {Object}
21+
*/
22+
create: function (context) {
23+
'use strict';
1924

20-
return {
21-
CallExpression: function(node) {
22-
if (node.callee.type !== 'MemberExpression') return;
23-
if (node.callee.property.name !== 'andSelf') return;
25+
var utils = require('./utils.js');
2426

25-
if (utils.isjQuery(node)) {
26-
context.report({
27-
node: node,
28-
messageId: 'andSelf'
29-
});
30-
}
31-
}
32-
};
33-
}
27+
return {
28+
/**
29+
* Checks if andSelf is used in the node and reports it.
30+
*
31+
* @param {Object} node - The node to check.
32+
*/
33+
CallExpression: function (node) {
34+
// jscs:disable requireCurlyBraces
35+
if (node.callee.type !== 'MemberExpression') return;
36+
37+
if (node.callee.property.name !== 'andSelf') return;
38+
// jscs:enable requireCurlyBraces
39+
40+
if (utils.isjQuery(node)) {
41+
context.report({
42+
node: node,
43+
messageId: 'andSelf'
44+
});
45+
}
46+
}
47+
};
48+
}
3449
};

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

+43-28
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,49 @@
11
module.exports = {
2-
meta: {
3-
type: 'suggestion',
4-
docs: {
5-
description: 'Disallow the use of the deprecated $.bind and $.unbind',
6-
category: 'jQuery deprecated functions',
7-
recommended: true,
8-
url: 'https://api.jquery.com/bind/'
2+
meta: {
3+
type: 'suggestion',
4+
docs: {
5+
description: 'Disallow the use of the deprecated $.bind and $.unbind',
6+
category: 'jQuery deprecated functions',
7+
recommended: true,
8+
url: 'https://api.jquery.com/bind/'
9+
},
10+
schema: [],
11+
messages: {
12+
bind: 'jQuery $.bind and $.unbind are deprecated, use $.on and $.off instead'
13+
}
914
},
10-
schema: [],
11-
messages: {
12-
bind: 'jQuery $.bind and $.unbind are deprecated, use $.on and $.off instead'
13-
}
14-
},
1515

16-
create: function(context) {
17-
'use strict';
18-
var utils = require('./utils.js');
16+
/**
17+
* Executes the function to check if bind and unbind are used.
18+
*
19+
* @param {Object} context
20+
* @returns {Object}
21+
*/
22+
create: function (context) {
23+
'use strict';
1924

20-
return {
21-
CallExpression: function(node) {
22-
if (node.callee.type !== 'MemberExpression') return;
23-
if (!['bind', 'unbind'].includes(node.callee.property.name)) return;
25+
var utils = require('./utils.js');
2426

25-
if (utils.isjQuery(node)) {
26-
context.report({
27-
node: node,
28-
messageId: 'bind'
29-
});
30-
}
31-
}
32-
};
33-
}
27+
return {
28+
/**
29+
* Checks if bind and unbind are used in the node and reports it.
30+
*
31+
* @param {Object} node - The node to check.
32+
*/
33+
CallExpression: function (node) {
34+
// jscs:disable requireCurlyBraces
35+
if (node.callee.type !== 'MemberExpression') return;
36+
37+
if (!['bind', 'unbind'].includes(node.callee.property.name)) return;
38+
// jscs:enable requireCurlyBraces
39+
40+
if (utils.isjQuery(node)) {
41+
context.report({
42+
node: node,
43+
messageId: 'bind'
44+
});
45+
}
46+
}
47+
};
48+
}
3449
};

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

+48-34
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,55 @@
11
module.exports = {
2-
meta: {
3-
type: 'suggestion',
4-
docs: {
5-
description: 'Disallow the use of shortcuts to trigger events',
6-
category: 'jQuery deprecated functions',
7-
recommended: true,
8-
url: 'https://api.jquery.com/bind/'
2+
meta: {
3+
type: 'suggestion',
4+
docs: {
5+
description: 'Disallow the use of shortcuts to trigger events',
6+
category: 'jQuery deprecated functions',
7+
recommended: true,
8+
url: 'https://api.jquery.com/bind/'
9+
},
10+
schema: []
911
},
10-
schema: [],
11-
},
1212

13-
create: function(context) {
14-
'use strict';
15-
var utils = require('./utils.js');
13+
/**
14+
* Executes the function to check if shortcuts are used to trigger events.
15+
*
16+
* @param {Object} context
17+
* @returns {Object}
18+
*/
19+
create: function (context) {
20+
'use strict';
1621

17-
return {
18-
CallExpression: function(node) {
19-
var names, name;
22+
var utils = require('./utils.js');
2023

21-
names = [
22-
'blur', 'focus', 'focusin', 'focusout', 'resize', 'scroll', 'dblclick', 'mousedown', 'mouseup', 'mousemove',
23-
'mouseover', 'mouseout', 'mouseenter', 'mouseleave', 'change', 'select', 'submit', 'keydown', 'keypress',
24-
'keyup', 'contextmenu', 'click'
25-
];
24+
return {
25+
/**
26+
* Checks if shortcuts are used to trigger events and reports it.
27+
*
28+
* @param {Object} node - The node to check.
29+
*/
30+
CallExpression: function (node) {
31+
var names, name;
2632

27-
if (node.callee.type !== 'MemberExpression') return;
28-
if (!names.includes(node.callee.property.name)) return;
29-
if (utils.isjQuery(node)) {
30-
name = node.callee.property.name;
31-
context.report({
32-
node: node,
33-
message:
34-
'Instead of .' + name + '(fn) use .on("' + name + '", fn). Instead of .' + name
35-
+ '() use .trigger("' + name + '")'
36-
});
37-
}
38-
}
39-
};
40-
}
33+
names = ['blur', 'focus', 'focusin', 'focusout', 'resize', 'scroll', 'dblclick', 'mousedown',
34+
'mouseup', 'mousemove','mouseover', 'mouseout', 'mouseenter', 'mouseleave', 'change', 'select',
35+
'submit', 'keydown', 'keypress', 'keyup', 'contextmenu', 'click'];
36+
37+
// jscs:disable requireCurlyBraces
38+
if (node.callee.type !== 'MemberExpression') return;
39+
40+
if (!names.includes(node.callee.property.name)) return;
41+
// jscs:enable requireCurlyBraces
42+
43+
if (utils.isjQuery(node)) {
44+
name = node.callee.property.name;
45+
context.report({
46+
node: node,
47+
message:
48+
'Instead of .' + name + '(fn) use .on("' + name + '", fn). Instead of .' + name +
49+
'() use .trigger("' + name + '")'
50+
});
51+
}
52+
}
53+
};
54+
}
4155
};

0 commit comments

Comments
 (0)