Merge pull request #706 from Gym/formatting-reboot

formatting reboot (space-2 and consistency)

.bowerrc

@@ -1,3 +1,3 @@
 {
-	"directory": "public/lib"
+  "directory": "public/lib"
 }

.csslintrc

@@ -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
 }

.editorconfig

@@ -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

.jshintrc

@@ -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.
 }

config/assets/default.js

@@ -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'
+  }
 };

config/assets/development.js

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

config/assets/production.js

@@ -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'
+  }
 };

config/assets/test.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']
+  }
 };