Skip to content

Commit 322a4a6

Browse files
committed
JSHint replaced with ESLint
1 parent ad54573 commit 322a4a6

File tree

6 files changed

+43
-66
lines changed

6 files changed

+43
-66
lines changed

.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,17 @@ jobs:
3131
- travis_retry composer create-project nette/code-checker temp/code-checker ~2 --no-progress
3232
# Install Nette Coding Standard
3333
- travis_retry composer create-project nette/coding-standard temp/coding-standard --no-progress
34-
# Install Grunt
34+
# Install new Node.js
35+
- . $HOME/.nvm/nvm.sh
36+
- nvm install stable
37+
- nvm use stable
38+
# Install Grunt and Eslint
3539
- npm install -g grunt-cli; cd tests/netteForms; npm install; cd ../..
3640
script:
3741
- php temp/code-checker/src/code-checker.php --short-arrays --strict-types
3842
- php temp/coding-standard/ecs check src tests examples --config temp/coding-standard/coding-standard-php71.neon
3943
- grunt --gruntfile=tests/netteForms/Gruntfile.js test
44+
- tests/netteForms/node_modules/.bin/eslint src/assets/netteForms.js --config tests/.eslintrc.js
4045

4146

4247
- stage: Code Coverage

src/assets/netteForms.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@
9999
return values;
100100

101101
} else if (elem.name && elem.name.match(/\[\]$/)) { // multiple elements []
102-
var elements = elem.form.elements[elem.name].tagName ? [elem] : elem.form.elements[elem.name],
103-
values = [];
102+
elements = elem.form.elements[elem.name].tagName ? [elem] : elem.form.elements[elem.name];
103+
values = [];
104104

105105
for (i = 0; i < elements.length; i++) {
106106
if (elements[i].type !== 'checkbox' || elements[i].checked) {
@@ -425,7 +425,7 @@
425425
},
426426

427427
email: function(elem, arg, val) {
428-
return (/^("([ !#-[\]-~]|\\[ -~])+"|[-a-z0-9!#$%&'*+\/=?^_`{|}~]+(\.[-a-z0-9!#$%&'*+\/=?^_`{|}~]+)*)@([0-9a-z\u00C0-\u02FF\u0370-\u1EFF]([-0-9a-z\u00C0-\u02FF\u0370-\u1EFF]{0,61}[0-9a-z\u00C0-\u02FF\u0370-\u1EFF])?\.)+[a-z\u00C0-\u02FF\u0370-\u1EFF]([-0-9a-z\u00C0-\u02FF\u0370-\u1EFF]{0,17}[a-z\u00C0-\u02FF\u0370-\u1EFF])?$/i).test(val);
428+
return (/^("([ !#-[\]-~]|\\[ -~])+"|[-a-z0-9!#$%&'*+/=?^_`{|}~]+(\.[-a-z0-9!#$%&'*+/=?^_`{|}~]+)*)@([0-9a-z\u00C0-\u02FF\u0370-\u1EFF]([-0-9a-z\u00C0-\u02FF\u0370-\u1EFF]{0,61}[0-9a-z\u00C0-\u02FF\u0370-\u1EFF])?\.)+[a-z\u00C0-\u02FF\u0370-\u1EFF]([-0-9a-z\u00C0-\u02FF\u0370-\u1EFF]{0,17}[a-z\u00C0-\u02FF\u0370-\u1EFF])?$/i).test(val);
429429
},
430430

431431
url: function(elem, arg, val, value) {
@@ -443,13 +443,13 @@
443443
var parts = typeof arg === 'string' ? arg.match(/^\/(.*)\/([imu]*)$/) : false;
444444
try {
445445
return parts && (new RegExp(parts[1], parts[2].replace('u', ''))).test(val);
446-
} catch (e) {}
446+
} catch (e) {} // eslint-disable-line no-empty
447447
},
448448

449449
pattern: function(elem, arg, val) {
450450
try {
451451
return typeof arg === 'string' ? (new RegExp('^(?:' + arg + ')$')).test(val) : null;
452-
} catch (e) {}
452+
} catch (e) {} // eslint-disable-line no-empty
453453
},
454454

455455
numeric: function(elem, arg, val) {
@@ -539,7 +539,7 @@
539539
return true;
540540
},
541541

542-
'static': function (elem, arg, val) {
542+
'static': function (elem, arg) {
543543
return arg;
544544
}
545545
};
@@ -637,7 +637,7 @@
637637
/**
638638
* Displays or hides HTML element.
639639
*/
640-
Nette.toggle = function(id, visible, srcElement) {
640+
Nette.toggle = function(id, visible, srcElement) { // eslint-disable-line no-unused-vars
641641
var elem = document.getElementById(id);
642642
if (elem) {
643643
elem.style.display = visible ? '' : 'none';

tests/.eslintrc.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
module.exports = {
2+
"env": {
3+
"browser": true,
4+
"amd": true,
5+
"commonjs": true
6+
},
7+
"globals": {
8+
"Tracy": true
9+
},
10+
"extends": "eslint:recommended",
11+
"rules": {
12+
"indent": [
13+
"error",
14+
"tab"
15+
],
16+
"quotes": [
17+
"error",
18+
"single"
19+
],
20+
"semi": [
21+
"error",
22+
"always"
23+
]
24+
}
25+
};

tests/netteForms/.jshintrc

Lines changed: 0 additions & 44 deletions
This file was deleted.

tests/netteForms/Gruntfile.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
module.exports = function(grunt) {
22
grunt.initConfig({
3-
jshint: {
4-
options: {
5-
jshintrc: '.jshintrc'
6-
},
7-
all: [
8-
'../../src/assets/*.js', '!../../src/assets/*.min.js'
9-
]
10-
},
113
jasmine: {
124
test: {
135
src: [
@@ -23,10 +15,9 @@ module.exports = function(grunt) {
2315
}
2416
});
2517

26-
grunt.loadNpmTasks('grunt-contrib-jshint');
2718
grunt.loadNpmTasks('grunt-contrib-jasmine');
2819

2920
grunt.registerTask('test', [
30-
'jshint','jasmine'
21+
'jasmine'
3122
]);
3223
};

tests/netteForms/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"devDependencies": {
3-
"grunt": "^1.0.1",
4-
"grunt-contrib-jasmine": "^1.0.3",
5-
"grunt-contrib-jshint": "^1.0.0",
6-
"jasmine": "^2.5.2",
3+
"eslint": "^4.19.1",
4+
"grunt": "^1.0.3",
5+
"grunt-contrib-jasmine": "^1.2.0",
6+
"jasmine": "^2.99.0",
77
"js-fixtures": "^1.5.3"
88
}
99
}

0 commit comments

Comments
 (0)