Skip to content

Commit

Permalink
Merge pull request #236 from stampit-org/v3_0-linting-fixes
Browse files Browse the repository at this point in the history
Fix some lint issues and update airbnb
  • Loading branch information
koresar committed Sep 22, 2016
2 parents f9f9184 + 777988f commit beb5f7b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .eslintrc
Expand Up @@ -7,7 +7,6 @@
"comma-dangle": 0,
"no-confusing-arrow": 0,
"prefer-rest-params": 0,
"no-use-before-define": 1,
"no-plusplus": ["error", { "allowForLoopAfterthoughts": true }]
"no-use-before-define": [2, "nofunc"],
}
}
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -54,7 +54,7 @@
"check-compose": "^3.2.0",
"dependency-check": "^2.5.0",
"eslint": "^3.5.0",
"eslint-config-airbnb-base": "^7.1.0",
"eslint-config-airbnb-base": "7.1.0",
"eslint-plugin-import": "^1.15.0",
"isparta": "^4.0.0",
"lodash": "^4.16.1",
Expand Down
2 changes: 1 addition & 1 deletion src/extract-functions.js
Expand Up @@ -2,7 +2,7 @@ import isFunction from './isFunction';

export default function (...args) {
let result = [];
for (let i = 0; i < args.length; i++) {
for (let i = 0; i < args.length; i += 1) {
const arg = args[i];
if (isFunction(arg)) result.push(arg);
else if (Array.isArray(arg)) result = result.concat(arg.filter(isFunction));
Expand Down
2 changes: 1 addition & 1 deletion src/merge.js
Expand Up @@ -23,7 +23,7 @@ function mergeOne(dst, src) {
const returnValue = isObject(dst) ? dst : {};

const keys = Object.keys(src);
for (let i = 0; i < keys.length; i++) {
for (let i = 0; i < keys.length; i += 1) {
const key = keys[i];

const srcValue = src[key];
Expand Down

0 comments on commit beb5f7b

Please sign in to comment.