Skip to content

Commit bc3087e

Browse files
authored
Merge pull request #61 from FullstackAcademy/eslint
use official fullstack eslint config
2 parents ecd218f + 6eb1e77 commit bc3087e

File tree

27 files changed

+124
-284
lines changed

27 files changed

+124
-284
lines changed

generated/.eslintrc

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

generated/.eslintrc.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// http://eslint.org/docs/rules/
2+
{
3+
"extends": "fullstack", // from the `eslint-config-fullstack` npm module,
4+
"env": {
5+
"es6": true,
6+
"node": false,
7+
"browser": false,
8+
"jquery": false,
9+
"mocha": false,
10+
"jasmine": false
11+
},
12+
"rules": {
13+
"global-require": 0, // 0 = off, 1 = warn (yellow), 2 = error (red)
14+
"camelcase": 0
15+
// add more rules here to override the fullstack config
16+
}
17+
}

generated/browser/js/.eslintrc.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"env": {
3+
"browser": true
4+
},
5+
"globals": {
6+
"app": true,
7+
"_": true
8+
}
9+
}

generated/browser/js/about/about.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ app.controller('AboutController', function ($scope, FullstackPics) {
1414
// Images of beautiful Fullstack people.
1515
$scope.images = _.shuffle(FullstackPics);
1616

17-
});
17+
});

generated/browser/js/common/directives/fullstack-logo/fullstack-logo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ app.directive('fullstackLogo', function () {
33
restrict: 'E',
44
templateUrl: 'js/common/directives/fullstack-logo/fullstack-logo.html'
55
};
6-
});
6+
});

generated/browser/js/common/directives/rando-greeting/rando-greeting.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ app.directive('randoGreeting', function (RandomGreetings) {
88
}
99
};
1010

11-
});
11+
});

generated/browser/js/fsa/fsa-pre-built.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,4 +127,4 @@
127127

128128
});
129129

130-
})();
130+
}());

generated/browser/js/home/home.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ app.config(function ($stateProvider) {
33
url: '/',
44
templateUrl: 'js/home/home.html'
55
});
6-
});
6+
});

generated/browser/js/login/login.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ app.controller('LoginCtrl', function ($scope, AuthService, $state) {
2525

2626
};
2727

28-
});
28+
});

generated/browser/js/members-only/members-only.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ app.factory('SecretStash', function ($http) {
2929
getStash: getStash
3030
};
3131

32-
});
32+
});

0 commit comments

Comments
 (0)