Skip to content

Commit

Permalink
JSHint replaced with ESLint
Browse files Browse the repository at this point in the history
  • Loading branch information
dg committed Jun 28, 2018
1 parent dce6bb1 commit cc36f2a
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 66 deletions.
7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,17 @@ jobs:
- travis_retry composer create-project nette/code-checker temp/code-checker ~2 --no-progress
# Install Nette Coding Standard
- travis_retry composer create-project nette/coding-standard temp/coding-standard --no-progress
# Install Grunt
# Install new Node.js
- . $HOME/.nvm/nvm.sh
- nvm install stable
- nvm use stable
# Install Grunt and Eslint
- npm install -g grunt-cli; cd tests/netteForms; npm install; cd ../..
script:
- php temp/code-checker/src/code-checker.php --short-arrays
- php temp/coding-standard/ecs check src tests examples --config temp/coding-standard/coding-standard-php56.neon
- grunt --gruntfile=tests/netteForms/Gruntfile.js test
- tests/netteForms/node_modules/.bin/eslint src/assets/netteForms.js --config tests/.eslintrc.js


- stage: Code Coverage
Expand Down
14 changes: 7 additions & 7 deletions src/assets/netteForms.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@
return values;

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

for (i = 0; i < elements.length; i++) {
if (elements[i].type !== 'checkbox' || elements[i].checked) {
Expand Down Expand Up @@ -432,7 +432,7 @@
},

email: function(elem, arg, val) {
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);
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);
},

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

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

integer: function(elem, arg, val) {
Expand Down Expand Up @@ -539,7 +539,7 @@
return true;
},

'static': function (elem, arg, val) {
'static': function (elem, arg) {
return arg;
}
};
Expand Down Expand Up @@ -638,7 +638,7 @@
/**
* Displays or hides HTML element.
*/
Nette.toggle = function(id, visible, srcElement) {
Nette.toggle = function(id, visible, srcElement) { // eslint-disable-line no-unused-vars
var elem = document.getElementById(id);
if (elem) {
elem.style.display = visible ? '' : 'none';
Expand Down
25 changes: 25 additions & 0 deletions tests/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
module.exports = {
"env": {
"browser": true,
"amd": true,
"commonjs": true
},
"globals": {
"Tracy": true
},
"extends": "eslint:recommended",
"rules": {
"indent": [
"error",
"tab"
],
"quotes": [
"error",
"single"
],
"semi": [
"error",
"always"
]
}
};
44 changes: 0 additions & 44 deletions tests/netteForms/.jshintrc

This file was deleted.

11 changes: 1 addition & 10 deletions tests/netteForms/Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
module.exports = function(grunt) {
grunt.initConfig({
jshint: {
options: {
jshintrc: '.jshintrc'
},
all: [
'../../src/assets/*.js', '!../../src/assets/*.min.js'
]
},
jasmine: {
test: {
src: [
Expand All @@ -23,10 +15,9 @@ module.exports = function(grunt) {
}
});

grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-jasmine');

grunt.registerTask('test', [
'jshint','jasmine'
'jasmine'
]);
};
8 changes: 4 additions & 4 deletions tests/netteForms/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"devDependencies": {
"grunt": "^1.0.1",
"grunt-contrib-jasmine": "^1.0.3",
"grunt-contrib-jshint": "^1.0.0",
"jasmine": "^2.5.2",
"eslint": "^4.19.1",
"grunt": "^1.0.3",
"grunt-contrib-jasmine": "^1.2.0",
"jasmine": "^2.99.0",
"js-fixtures": "^1.5.3"
}
}

0 comments on commit cc36f2a

Please sign in to comment.