Skip to content
This repository was archived by the owner on Aug 30, 2021. It is now read-only.

Commit 9c0068c

Browse files
lirantallirantal
committed
Merge pull request #706 from Gym/formatting-reboot
formatting reboot (space-2 and consistency)
2 parents 7aaf363 + ef3a3f9 commit 9c0068c

File tree

124 files changed

+4330
-4317
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+4330
-4317
lines changed

‎.bowerrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"directory": "public/lib"
2+
"directory": "public/lib"
33
}

‎.csslintrc

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"adjoining-classes": false,
3-
"box-model": false,
4-
"box-sizing": false,
5-
"floats": false,
6-
"font-sizes": false,
7-
"important": false,
8-
"known-properties": false,
9-
"overqualified-elements": false,
10-
"qualified-headings": false,
11-
"regex-selectors": false,
12-
"unique-headings": false,
13-
"universal-selector": false,
14-
"unqualified-attributes": false
2+
"adjoining-classes": false,
3+
"box-model": false,
4+
"box-sizing": false,
5+
"floats": false,
6+
"font-sizes": false,
7+
"important": false,
8+
"known-properties": false,
9+
"overqualified-elements": false,
10+
"qualified-headings": false,
11+
"regex-selectors": false,
12+
"unique-headings": false,
13+
"universal-selector": false,
14+
"unqualified-attributes": false
1515
}

‎.editorconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ insert_final_newline = true
1414
# Standard at: https://github.com/felixge/node-style-guide
1515
[**.js, **.json]
1616
trim_trailing_whitespace = true
17-
indent_style = tab
17+
indent_style = space
18+
indent_size = 2
1819
quote_type = single
1920
curly_bracket_next_line = false
2021
spaces_around_operators = true
2122
space_after_control_statements = true
22-
space_after_anonymous_functions = false
23+
space_after_anonymous_functions = true
2324
spaces_in_brackets = false
2425

2526
# No Standard. Please document a standard if different from .js

‎.jshintrc

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
{
2-
"node": true, // Enable globals available when code is running inside of the NodeJS runtime environment.
3-
"mocha": true, // Enable globals available when code is running inside of the Mocha tests.
4-
"jasmine": true, // Enable globals available when code is running inside of the Jasmine tests.
5-
"browser": true, // Standard browser globals e.g. `window`, `document`.
6-
"esnext": true, // Allow ES.next specific features such as `const` and `let`.
7-
"bitwise": false, // Prohibit bitwise operators (&, |, ^, etc.).
8-
"camelcase": false, // Permit only camelcase for `var` and `object indexes`.
9-
"curly": false, // Require {} for every new block or scope.
10-
"eqeqeq": true, // Require triple equals i.e. `===`.
11-
"immed": true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
12-
"latedef": true, // Prohibit variable use before definition.
13-
"newcap": true, // Require capitalization of all constructor functions e.g. `new F()`.
14-
"noarg": true, // Prohibit use of `arguments.caller` and `arguments.callee`.
15-
"quotmark": "single", // Define quotes to string values.
16-
"regexp": true, // Prohibit `.` and `[^...]` in regular expressions.
17-
"undef": true, // Require all non-global variables be declared before they are used.
18-
"unused": false, // Warn unused variables.
19-
"strict": true, // Require `use strict` pragma in every file.
20-
"trailing": true, // Prohibit trailing whitespaces.
21-
"smarttabs": false, // Suppresses warnings about mixed tabs and spaces
22-
"globals": { // Globals variables.
23-
"angular": true,
24-
"io": true,
25-
"ApplicationConfiguration": true
26-
},
27-
"predef": [ // Extra globals.
28-
"inject",
29-
"by",
30-
"browser",
31-
"element"
32-
],
33-
"indent": 4, // Specify indentation spacing
34-
"devel": true, // Allow development statements e.g. `console.log();`.
35-
"noempty": true // Prohibit use of empty blocks.
2+
"node": true, // Enable globals available when code is running inside of the NodeJS runtime environment.
3+
"mocha": true, // Enable globals available when code is running inside of the Mocha tests.
4+
"jasmine": true, // Enable globals available when code is running inside of the Jasmine tests.
5+
"browser": true, // Standard browser globals e.g. `window`, `document`.
6+
"esnext": true, // Allow ES.next specific features such as `const` and `let`.
7+
"bitwise": false, // Prohibit bitwise operators (&, |, ^, etc.).
8+
"camelcase": false, // Permit only camelcase for `var` and `object indexes`.
9+
"curly": false, // Require {} for every new block or scope.
10+
"eqeqeq": true, // Require triple equals i.e. `===`.
11+
"immed": true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
12+
"latedef": true, // Prohibit variable use before definition.
13+
"newcap": true, // Require capitalization of all constructor functions e.g. `new F()`.
14+
"noarg": true, // Prohibit use of `arguments.caller` and `arguments.callee`.
15+
"quotmark": "single", // Define quotes to string values.
16+
"regexp": true, // Prohibit `.` and `[^...]` in regular expressions.
17+
"undef": true, // Require all non-global variables be declared before they are used.
18+
"unused": false, // Warn unused variables.
19+
"strict": true, // Require `use strict` pragma in every file.
20+
"trailing": true, // Prohibit trailing whitespaces.
21+
"smarttabs": false, // Suppresses warnings about mixed tabs and spaces
22+
"globals": { // Globals variables.
23+
"angular": true,
24+
"io": true,
25+
"ApplicationConfiguration": true
26+
},
27+
"predef": [ // Extra globals.
28+
"inject",
29+
"by",
30+
"browser",
31+
"element"
32+
],
33+
"indent": 4, // Specify indentation spacing
34+
"devel": true, // Allow development statements e.g. `console.log();`.
35+
"noempty": true // Prohibit use of empty blocks.
3636
}

‎config/assets/default.js

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
'use strict';
22

33
module.exports = {
4-
client: {
5-
lib: {
6-
css: [
7-
'public/lib/bootstrap/dist/css/bootstrap.css',
8-
'public/lib/bootstrap/dist/css/bootstrap-theme.css'
9-
],
10-
js: [
11-
'public/lib/angular/angular.js',
12-
'public/lib/angular-resource/angular-resource.js',
13-
'public/lib/angular-animate/angular-animate.js',
14-
'public/lib/angular-ui-router/release/angular-ui-router.js',
15-
'public/lib/angular-ui-utils/ui-utils.js',
16-
'public/lib/angular-bootstrap/ui-bootstrap-tpls.js',
17-
'public/lib/angular-file-upload/angular-file-upload.js'
18-
],
19-
tests: ['public/lib/angular-mocks/angular-mocks.js']
20-
},
21-
css: [
22-
'modules/*/client/css/*.css'
23-
],
24-
less: [
25-
'modules/*/client/less/*.less'
26-
],
27-
sass: [
28-
'modules/*/client/scss/*.scss'
29-
],
30-
js: [
31-
'modules/core/client/app/config.js',
32-
'modules/core/client/app/init.js',
33-
'modules/*/client/*.js',
34-
'modules/*/client/**/*.js'
35-
],
36-
views: ['modules/*/client/views/**/*.html']
37-
},
38-
server: {
39-
gruntConfig: 'gruntfile.js',
40-
gulpConfig: 'gulpfile.js',
41-
allJS: ['server.js', 'config/**/*.js', 'modules/*/server/**/*.js'],
42-
models: 'modules/*/server/models/**/*.js',
43-
routes: ['modules/!(core)/server/routes/**/*.js', 'modules/core/server/routes/**/*.js'],
44-
sockets: 'modules/*/server/sockets/**/*.js',
45-
config: 'modules/*/server/config/*.js',
46-
policies: 'modules/*/server/policies/*.js',
47-
views: 'modules/*/server/views/*.html'
48-
}
4+
client: {
5+
lib: {
6+
css: [
7+
'public/lib/bootstrap/dist/css/bootstrap.css',
8+
'public/lib/bootstrap/dist/css/bootstrap-theme.css'
9+
],
10+
js: [
11+
'public/lib/angular/angular.js',
12+
'public/lib/angular-resource/angular-resource.js',
13+
'public/lib/angular-animate/angular-animate.js',
14+
'public/lib/angular-ui-router/release/angular-ui-router.js',
15+
'public/lib/angular-ui-utils/ui-utils.js',
16+
'public/lib/angular-bootstrap/ui-bootstrap-tpls.js',
17+
'public/lib/angular-file-upload/angular-file-upload.js'
18+
],
19+
tests: ['public/lib/angular-mocks/angular-mocks.js']
20+
},
21+
css: [
22+
'modules/*/client/css/*.css'
23+
],
24+
less: [
25+
'modules/*/client/less/*.less'
26+
],
27+
sass: [
28+
'modules/*/client/scss/*.scss'
29+
],
30+
js: [
31+
'modules/core/client/app/config.js',
32+
'modules/core/client/app/init.js',
33+
'modules/*/client/*.js',
34+
'modules/*/client/**/*.js'
35+
],
36+
views: ['modules/*/client/views/**/*.html']
37+
},
38+
server: {
39+
gruntConfig: 'gruntfile.js',
40+
gulpConfig: 'gulpfile.js',
41+
allJS: ['server.js', 'config/**/*.js', 'modules/*/server/**/*.js'],
42+
models: 'modules/*/server/models/**/*.js',
43+
routes: ['modules/!(core)/server/routes/**/*.js', 'modules/core/server/routes/**/*.js'],
44+
sockets: 'modules/*/server/sockets/**/*.js',
45+
config: 'modules/*/server/config/*.js',
46+
policies: 'modules/*/server/policies/*.js',
47+
views: 'modules/*/server/views/*.html'
48+
}
4949
};

‎config/assets/development.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
// Development assets
4+
// Development assets
55
};

‎config/assets/production.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
'use strict';
22

33
module.exports = {
4-
client: {
5-
lib: {
6-
css: [
7-
'public/lib/bootstrap/dist/css/bootstrap.min.css',
8-
'public/lib/bootstrap/dist/css/bootstrap-theme.min.css',
9-
],
10-
js: [
11-
'public/lib/angular/angular.min.js',
12-
'public/lib/angular-resource/angular-resource.min.js',
13-
'public/lib/angular-animate/angular-animate.min.js',
14-
'public/lib/angular-ui-router/release/angular-ui-router.min.js',
15-
'public/lib/angular-ui-utils/ui-utils.min.js',
16-
'public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js',
17-
'public/lib/angular-file-upload/angular-file-upload.min.js'
18-
]
19-
},
20-
css: 'public/dist/application.min.css',
21-
js: 'public/dist/application.min.js'
22-
}
4+
client: {
5+
lib: {
6+
css: [
7+
'public/lib/bootstrap/dist/css/bootstrap.min.css',
8+
'public/lib/bootstrap/dist/css/bootstrap-theme.min.css',
9+
],
10+
js: [
11+
'public/lib/angular/angular.min.js',
12+
'public/lib/angular-resource/angular-resource.min.js',
13+
'public/lib/angular-animate/angular-animate.min.js',
14+
'public/lib/angular-ui-router/release/angular-ui-router.min.js',
15+
'public/lib/angular-ui-utils/ui-utils.min.js',
16+
'public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js',
17+
'public/lib/angular-file-upload/angular-file-upload.min.js'
18+
]
19+
},
20+
css: 'public/dist/application.min.css',
21+
js: 'public/dist/application.min.js'
22+
}
2323
};

‎config/assets/test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict';
22

33
module.exports = {
4-
tests: {
5-
client: ['modules/*/tests/client/**/*.js'],
6-
server: ['modules/*/tests/server/**/*.js'],
7-
e2e: ['modules/*/tests/e2e/**/*.js']
8-
}
4+
tests: {
5+
client: ['modules/*/tests/client/**/*.js'],
6+
server: ['modules/*/tests/server/**/*.js'],
7+
e2e: ['modules/*/tests/e2e/**/*.js']
8+
}
99
};

0 commit comments

Comments
 (0)