Skip to content
Permalink
Browse files

formatting reboot (space-2 and consistency)

JSCS fixes

update editorconfig
  • Loading branch information...
rhutchison committed Jul 25, 2015
1 parent 7aaf363 commit ef3a3f954852c7717844fe0c18647ad4290b2945
Showing with 4,330 additions and 4,317 deletions.
  1. +1 −1 .bowerrc
  2. +13 −13 .csslintrc
  3. +3 −2 .editorconfig
  4. +34 −34 .jshintrc
  5. +45 −45 config/assets/default.js
  6. +1 −1 config/assets/development.js
  7. +19 −19 config/assets/production.js
  8. +5 −5 config/assets/test.js
  9. +117 −116 config/config.js
  10. +12 −12 config/env/default.js
  11. +62 −62 config/env/development.js
  12. +13 −13 config/env/local.example.js
  13. +61 −61 config/env/production.js
  14. +54 −54 config/env/test.js
  15. +156 −154 config/lib/express.js
  16. +26 −26 config/lib/mongoose.js
  17. +19 −19 config/lib/socket.io.js
  18. +240 −243 gruntfile.js
  19. +103 −103 gulpfile.js
  20. +2 −2 karma.conf.js
  21. +18 −18 modules/articles/client/config/articles.client.config.js
  22. +28 −28 modules/articles/client/config/articles.client.routes.js
  23. +54 −54 modules/articles/client/controllers/articles.client.controller.js
  24. +9 −9 modules/articles/client/services/articles.client.service.js
  25. +27 −27 modules/articles/client/views/create-article.client.view.html
  26. +27 −27 modules/articles/client/views/edit-article.client.view.html
  27. +18 −18 modules/articles/client/views/list-articles.client.view.html
  28. +20 −20 modules/articles/client/views/view-article.client.view.html
  29. +69 −68 modules/articles/server/controllers/articles.server.controller.js
  30. +20 −20 modules/articles/server/models/article.server.model.js
  31. +51 −51 modules/articles/server/policies/articles.server.policy.js
  32. +13 −13 modules/articles/server/routes/articles.server.routes.js
  33. +22 −22 modules/articles/tests/client/articles.client.controller.tests.js
  34. +7 −7 modules/articles/tests/e2e/articles.e2e.tests.js
  35. +42 −42 modules/articles/tests/server/article.server.model.tests.js
  36. +306 −307 modules/articles/tests/server/article.server.routes.tests.js
  37. +7 −7 modules/chat/client/config/chat.client.config.js
  38. +10 −10 modules/chat/client/config/chat.client.routes.js
  39. +37 −36 modules/chat/client/controllers/chat.client.controller.js
  40. +7 −10 modules/chat/client/css/chat.css
  41. +23 −22 modules/chat/client/views/chat.client.view.html
  42. +26 −26 modules/chat/server/sockets/chat.server.socket.config.js
  43. +18 −18 modules/chat/tests/client/chat.client.controller.tests.js
  44. +2 −2 modules/chat/tests/e2e/chat.e2e.tests.js
  45. +2 −2 modules/chat/tests/server/chat.socket.tests.js
  46. +16 −16 modules/core/client/app/config.js
  47. +40 −37 modules/core/client/app/init.js
  48. +8 −8 modules/core/client/config/core-admin.client.menus.js
  49. +11 −11 modules/core/client/config/core-admin.client.routes.js
  50. +14 −14 modules/core/client/config/core.client.routes.js
  51. +16 −16 modules/core/client/controllers/header.client.controller.js
  52. +4 −4 modules/core/client/controllers/home.client.controller.js
  53. +23 −21 modules/core/client/css/core.css
  54. +12 −11 modules/core/client/services/menus.client.service.js
  55. +32 −33 modules/core/client/services/socket.io.client.service.js
  56. +2 −3 modules/core/client/views/404.client.view.html
  57. +57 −57 modules/core/client/views/header.client.view.html
  58. +81 −91 modules/core/client/views/home.client.view.html
  59. +24 −22 modules/core/server/controllers/core.server.controller.js
  60. +29 −27 modules/core/server/controllers/errors.server.controller.js
  61. +9 −9 modules/core/server/routes/core.server.routes.js
  62. +3 −3 modules/core/server/views/404.server.view.html
  63. +1 −1 modules/core/server/views/500.server.view.html
  64. +1 −1 modules/core/server/views/index.server.view.html
  65. +54 −54 modules/core/server/views/layout.server.view.html
  66. +3 −3 modules/core/tests/client/core.client.tests.js
  67. +13 −13 modules/core/tests/client/header.client.controller.tests.js
  68. +17 −17 modules/core/tests/client/home.client.controller.tests.js
  69. +6 −6 modules/users/client/config/users-admin.client.menus.js
  70. +32 −32 modules/users/client/config/users-admin.client.routes.js
  71. +23 −23 modules/users/client/config/users.client.config.js
  72. +67 −67 modules/users/client/config/users.client.routes.js
  73. +24 −24 modules/users/client/controllers/admin/user-list.client.controller.js
  74. +26 −26 modules/users/client/controllers/admin/user.client.controller.js
  75. +47 −45 modules/users/client/controllers/authentication.client.controller.js
  76. +42 −40 modules/users/client/controllers/password.client.controller.js
  77. +14 −14 modules/users/client/controllers/settings/change-password.client.controller.js
  78. +56 −56 modules/users/client/controllers/settings/change-profile-picture.client.controller.js
  79. +18 −18 modules/users/client/controllers/settings/edit-profile.client.controller.js
  80. +29 −29 modules/users/client/controllers/settings/manage-social-accounts.client.controller.js
  81. +3 −3 modules/users/client/controllers/settings/settings.client.controller.js
  82. +24 −29 modules/users/client/css/users.css
  83. +6 −6 modules/users/client/services/authentication.client.service.js
  84. +16 −17 modules/users/client/services/users.client.service.js
  85. +33 −33 modules/users/client/views/admin/user-edit.client.view.html
  86. +17 −17 modules/users/client/views/admin/user-list.client.view.html
  87. +48 −48 modules/users/client/views/admin/user.client.view.html
  88. +10 −10 modules/users/client/views/authentication/authentication.client.view.html
  89. +28 −28 modules/users/client/views/authentication/signin.client.view.html
  90. +40 −40 modules/users/client/views/authentication/signup.client.view.html
  91. +3 −3 modules/users/client/views/password/forgot-password.client.view.html
  92. +2 −2 modules/users/client/views/password/reset-password-invalid.client.view.html
  93. +2 −2 modules/users/client/views/password/reset-password-success.client.view.html
  94. +27 −27 modules/users/client/views/settings/change-password.client.view.html
  95. +24 −24 modules/users/client/views/settings/change-profile-picture.client.view.html
  96. +31 −31 modules/users/client/views/settings/edit-profile.client.view.html
  97. +48 −48 modules/users/client/views/settings/manage-social-accounts.client.view.html
  98. +24 −24 modules/users/client/views/settings/settings.client.view.html
  99. +31 −31 modules/users/server/config/strategies/facebook.js
  100. +37 −35 modules/users/server/config/strategies/github.js
  101. +31 −31 modules/users/server/config/strategies/google.js
  102. +32 −32 modules/users/server/config/strategies/linkedin.js
  103. +24 −24 modules/users/server/config/strategies/local.js
  104. +30 −30 modules/users/server/config/strategies/paypal.js
  105. +34 −34 modules/users/server/config/strategies/twitter.js
  106. +23 −23 modules/users/server/config/users.server.config.js
  107. +50 −46 modules/users/server/controllers/admin.server.controller.js
  108. +4 −4 modules/users/server/controllers/users.server.controller.js
  109. +191 −188 modules/users/server/controllers/users/users.authentication.server.controller.js
  110. +19 −15 modules/users/server/controllers/users/users.authorization.server.controller.js
  111. +226 −222 modules/users/server/controllers/users/users.password.server.controller.js
  112. +67 −67 modules/users/server/controllers/users/users.profile.server.controller.js
  113. +107 −107 modules/users/server/models/user.server.model.js
  114. +27 −27 modules/users/server/policies/admin.server.policy.js
  115. +13 −13 modules/users/server/routes/admin.server.routes.js
  116. +49 −49 modules/users/server/routes/auth.server.routes.js
  117. +10 −10 modules/users/server/routes/users.server.routes.js
  118. +6 −6 modules/users/server/templates/reset-password-confirm-email.server.view.html
  119. +11 −11 modules/users/server/templates/reset-password-email.server.view.html
  120. +17 −17 modules/users/tests/client/authentication.client.controller.tests.js
  121. +10 −10 modules/users/tests/e2e/users.e2e.tests.js
  122. +98 −98 modules/users/tests/server/user.server.model.tests.js
  123. +93 −93 modules/users/tests/server/user.server.routes.tests.js
  124. +1 −1 protractor.conf.js
@@ -1,3 +1,3 @@
{
"directory": "public/lib"
"directory": "public/lib"
}
@@ -1,15 +1,15 @@
{
"adjoining-classes": false,
"box-model": false,
"box-sizing": false,
"floats": false,
"font-sizes": false,
"important": false,
"known-properties": false,
"overqualified-elements": false,
"qualified-headings": false,
"regex-selectors": false,
"unique-headings": false,
"universal-selector": false,
"unqualified-attributes": false
"adjoining-classes": false,
"box-model": false,
"box-sizing": false,
"floats": false,
"font-sizes": false,
"important": false,
"known-properties": false,
"overqualified-elements": false,
"qualified-headings": false,
"regex-selectors": false,
"unique-headings": false,
"universal-selector": false,
"unqualified-attributes": false
}
@@ -14,12 +14,13 @@ insert_final_newline = true
# Standard at: https://github.com/felixge/node-style-guide
[**.js, **.json]
trim_trailing_whitespace = true
indent_style = tab
indent_style = space
indent_size = 2
quote_type = single
curly_bracket_next_line = false
spaces_around_operators = true
space_after_control_statements = true
space_after_anonymous_functions = false
space_after_anonymous_functions = true
spaces_in_brackets = false

# No Standard. Please document a standard if different from .js
@@ -1,36 +1,36 @@
{
"node": true, // Enable globals available when code is running inside of the NodeJS runtime environment.
"mocha": true, // Enable globals available when code is running inside of the Mocha tests.
"jasmine": true, // Enable globals available when code is running inside of the Jasmine tests.
"browser": true, // Standard browser globals e.g. `window`, `document`.
"esnext": true, // Allow ES.next specific features such as `const` and `let`.
"bitwise": false, // Prohibit bitwise operators (&, |, ^, etc.).
"camelcase": false, // Permit only camelcase for `var` and `object indexes`.
"curly": false, // Require {} for every new block or scope.
"eqeqeq": true, // Require triple equals i.e. `===`.
"immed": true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
"latedef": true, // Prohibit variable use before definition.
"newcap": true, // Require capitalization of all constructor functions e.g. `new F()`.
"noarg": true, // Prohibit use of `arguments.caller` and `arguments.callee`.
"quotmark": "single", // Define quotes to string values.
"regexp": true, // Prohibit `.` and `[^...]` in regular expressions.
"undef": true, // Require all non-global variables be declared before they are used.
"unused": false, // Warn unused variables.
"strict": true, // Require `use strict` pragma in every file.
"trailing": true, // Prohibit trailing whitespaces.
"smarttabs": false, // Suppresses warnings about mixed tabs and spaces
"globals": { // Globals variables.
"angular": true,
"io": true,
"ApplicationConfiguration": true
},
"predef": [ // Extra globals.
"inject",
"by",
"browser",
"element"
],
"indent": 4, // Specify indentation spacing
"devel": true, // Allow development statements e.g. `console.log();`.
"noempty": true // Prohibit use of empty blocks.
"node": true, // Enable globals available when code is running inside of the NodeJS runtime environment.
"mocha": true, // Enable globals available when code is running inside of the Mocha tests.
"jasmine": true, // Enable globals available when code is running inside of the Jasmine tests.
"browser": true, // Standard browser globals e.g. `window`, `document`.
"esnext": true, // Allow ES.next specific features such as `const` and `let`.
"bitwise": false, // Prohibit bitwise operators (&, |, ^, etc.).
"camelcase": false, // Permit only camelcase for `var` and `object indexes`.
"curly": false, // Require {} for every new block or scope.
"eqeqeq": true, // Require triple equals i.e. `===`.
"immed": true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
"latedef": true, // Prohibit variable use before definition.
"newcap": true, // Require capitalization of all constructor functions e.g. `new F()`.
"noarg": true, // Prohibit use of `arguments.caller` and `arguments.callee`.
"quotmark": "single", // Define quotes to string values.
"regexp": true, // Prohibit `.` and `[^...]` in regular expressions.
"undef": true, // Require all non-global variables be declared before they are used.
"unused": false, // Warn unused variables.
"strict": true, // Require `use strict` pragma in every file.
"trailing": true, // Prohibit trailing whitespaces.
"smarttabs": false, // Suppresses warnings about mixed tabs and spaces
"globals": { // Globals variables.
"angular": true,
"io": true,
"ApplicationConfiguration": true
},
"predef": [ // Extra globals.
"inject",
"by",
"browser",
"element"
],
"indent": 4, // Specify indentation spacing
"devel": true, // Allow development statements e.g. `console.log();`.
"noempty": true // Prohibit use of empty blocks.
}
@@ -1,49 +1,49 @@
'use strict';

module.exports = {
client: {
lib: {
css: [
'public/lib/bootstrap/dist/css/bootstrap.css',
'public/lib/bootstrap/dist/css/bootstrap-theme.css'
],
js: [
'public/lib/angular/angular.js',
'public/lib/angular-resource/angular-resource.js',
'public/lib/angular-animate/angular-animate.js',
'public/lib/angular-ui-router/release/angular-ui-router.js',
'public/lib/angular-ui-utils/ui-utils.js',
'public/lib/angular-bootstrap/ui-bootstrap-tpls.js',
'public/lib/angular-file-upload/angular-file-upload.js'
],
tests: ['public/lib/angular-mocks/angular-mocks.js']
},
css: [
'modules/*/client/css/*.css'
],
less: [
'modules/*/client/less/*.less'
],
sass: [
'modules/*/client/scss/*.scss'
],
js: [
'modules/core/client/app/config.js',
'modules/core/client/app/init.js',
'modules/*/client/*.js',
'modules/*/client/**/*.js'
],
views: ['modules/*/client/views/**/*.html']
},
server: {
gruntConfig: 'gruntfile.js',
gulpConfig: 'gulpfile.js',
allJS: ['server.js', 'config/**/*.js', 'modules/*/server/**/*.js'],
models: 'modules/*/server/models/**/*.js',
routes: ['modules/!(core)/server/routes/**/*.js', 'modules/core/server/routes/**/*.js'],
sockets: 'modules/*/server/sockets/**/*.js',
config: 'modules/*/server/config/*.js',
policies: 'modules/*/server/policies/*.js',
views: 'modules/*/server/views/*.html'
}
client: {
lib: {
css: [
'public/lib/bootstrap/dist/css/bootstrap.css',
'public/lib/bootstrap/dist/css/bootstrap-theme.css'
],
js: [
'public/lib/angular/angular.js',
'public/lib/angular-resource/angular-resource.js',
'public/lib/angular-animate/angular-animate.js',
'public/lib/angular-ui-router/release/angular-ui-router.js',
'public/lib/angular-ui-utils/ui-utils.js',
'public/lib/angular-bootstrap/ui-bootstrap-tpls.js',
'public/lib/angular-file-upload/angular-file-upload.js'
],
tests: ['public/lib/angular-mocks/angular-mocks.js']
},
css: [
'modules/*/client/css/*.css'
],
less: [
'modules/*/client/less/*.less'
],
sass: [
'modules/*/client/scss/*.scss'
],
js: [
'modules/core/client/app/config.js',
'modules/core/client/app/init.js',
'modules/*/client/*.js',
'modules/*/client/**/*.js'
],
views: ['modules/*/client/views/**/*.html']
},
server: {
gruntConfig: 'gruntfile.js',
gulpConfig: 'gulpfile.js',
allJS: ['server.js', 'config/**/*.js', 'modules/*/server/**/*.js'],
models: 'modules/*/server/models/**/*.js',
routes: ['modules/!(core)/server/routes/**/*.js', 'modules/core/server/routes/**/*.js'],
sockets: 'modules/*/server/sockets/**/*.js',
config: 'modules/*/server/config/*.js',
policies: 'modules/*/server/policies/*.js',
views: 'modules/*/server/views/*.html'
}
};
@@ -1,5 +1,5 @@
'use strict';

module.exports = {
// Development assets
// Development assets
};
@@ -1,23 +1,23 @@
'use strict';

module.exports = {
client: {
lib: {
css: [
'public/lib/bootstrap/dist/css/bootstrap.min.css',
'public/lib/bootstrap/dist/css/bootstrap-theme.min.css',
],
js: [
'public/lib/angular/angular.min.js',
'public/lib/angular-resource/angular-resource.min.js',
'public/lib/angular-animate/angular-animate.min.js',
'public/lib/angular-ui-router/release/angular-ui-router.min.js',
'public/lib/angular-ui-utils/ui-utils.min.js',
'public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js',
'public/lib/angular-file-upload/angular-file-upload.min.js'
]
},
css: 'public/dist/application.min.css',
js: 'public/dist/application.min.js'
}
client: {
lib: {
css: [
'public/lib/bootstrap/dist/css/bootstrap.min.css',
'public/lib/bootstrap/dist/css/bootstrap-theme.min.css',
],
js: [
'public/lib/angular/angular.min.js',
'public/lib/angular-resource/angular-resource.min.js',
'public/lib/angular-animate/angular-animate.min.js',
'public/lib/angular-ui-router/release/angular-ui-router.min.js',
'public/lib/angular-ui-utils/ui-utils.min.js',
'public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js',
'public/lib/angular-file-upload/angular-file-upload.min.js'
]
},
css: 'public/dist/application.min.css',
js: 'public/dist/application.min.js'
}
};
@@ -1,9 +1,9 @@
'use strict';

module.exports = {
tests: {
client: ['modules/*/tests/client/**/*.js'],
server: ['modules/*/tests/server/**/*.js'],
e2e: ['modules/*/tests/e2e/**/*.js']
}
tests: {
client: ['modules/*/tests/client/**/*.js'],
server: ['modules/*/tests/server/**/*.js'],
e2e: ['modules/*/tests/e2e/**/*.js']
}
};

0 comments on commit ef3a3f9

Please sign in to comment.
You can’t perform that action at this time.