Conform project and config files to coding convention

.gitignore

@@ -8,3 +8,4 @@ tmp
 *.swp
 app/assets/css
 .sass-cache/
+out/

Gruntfile.js

@@ -1,6 +1,10 @@
 'use strict';
 
-module.exports = function(grunt) {
+module.exports = function (grunt) {
+
+    grunt.loadNpmTasks('grunt-contrib-sass');
+    grunt.loadNpmTasks('grunt-contrib-watch');
+    grunt.loadNpmTasks('grunt-jslint');
 
     grunt.initConfig({
 
@@ -12,7 +16,6 @@ module.exports = function(grunt) {
             css: ['<%= project.assets %>/sass/app.scss']
         },
 
-
         sass: {
             dev: {
                 options: {
@@ -20,7 +23,7 @@ module.exports = function(grunt) {
                     compass: false
                 },
                 files: {
-                    '<%= project.assets %>/css/app.css':'<%= project.css %>'
+                    '<%= project.assets %>/css/app.css' : '<%= project.css %>'
                 }
             }
         },
@@ -32,41 +35,39 @@ module.exports = function(grunt) {
             }
         },
 
-      jslint: { // configure the task
+        jslint: { // configure the task
 
-        client: {
+            client: {
-          src: [
+                src: [
-            'app/app.js',
+                    'karma.conf.js',
-            'app/**/*.js'
+                    'Gruntfile.js',
-          ],
+                    'app/app.js',
-          exclude: [
+                    'app/**/*.js'
-            'app/bower_components/**/*.js',
+                ],
-            'app/assets/**/*'
+                exclude: [
-          ],
+                    'app/bower_components/**/*.js',
-          directives: { // example directives
+                    'app/assets/**/*'
-            node: true,
+                ],
-            todo: true
+                directives: {
-          },
+                    node: true,
-          options: {
+                    unparam: true, // TEMPORARY: Ignore unused params
-            edition: 'latest', // specify an edition of jslint or use 'dir/mycustom-jslint.js' for own path
+                    predef: [ // Global variables
-            junit: 'out/client-junit.xml', // write the output to a JUnit XML
+                        'angular', 'inject', 'JustGage',
-            log: 'out/client-lint.log',
+                        'describe', 'beforeEach', 'it', 'expect'
-            jslintXml: 'out/client-jslint.xml',
+                    ]
-            errorsOnly: true, // only display errors
+                },
-            failOnError: false, // defaults to true
+                options: {
-            checkstyle: 'out/client-checkstyle.xml' // write a checkstyle-XML
+                    edition: 'latest', // specify an edition of jslint or use 'dir/mycustom-jslint.js' for own path
-          }
+                    junit: 'out/client-junit.xml', // write the output to a JUnit XML
+                    log: 'out/client-lint.log',
+                    jslintXml: 'out/client-jslint.xml',
+                    errorsOnly: true, // only display errors
+                    failOnError: false, // defaults to true
+                    checkstyle: 'out/client-checkstyle.xml' // write a checkstyle-XML
+                }
+            }
         }
-      }
     });
 
-    grunt.loadNpmTasks('grunt-contrib-sass');
+    grunt.registerTask('default', [ 'watch', 'jslint' ]);
-    grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-jslint');
-
-    grunt.registerTask('default', 'jslint');
-    grunt.registerTask('default', [
-        'watch'
-    ]);
-
 };

app/app.js

@@ -1,4 +1,3 @@
-/*global angular*/
 'use strict';
 
 angular.module('adagios', [

app/components/live/notifications.js

@@ -1,4 +1,3 @@
-/*global angular*/
 'use strict';
 
 angular.module('adagios.live', [])

app/components/ng-justgage/ng-justgage.js

@@ -1,4 +1,3 @@
-/*global angular, JustGage*/
 'use strict';
 
 angular.module("ngJustGage", [])

app/navbar/navbar.js

@@ -1,10 +1,9 @@
-/*global angular*/
 'use strict';
 
 angular.module('adagios.navbar', ['adagios.live'])
 
     .controller('NavBarCtrl', ['$scope', '$http', 'GetProblems', function ($scope, $http, GetProblems) {
-            $scope.notifications = GetProblems;
+        $scope.notifications = GetProblems;
     }])
 
     .directive('navbar', function () {

app/navbar/navbar_test.js

@@ -1,4 +1,3 @@
-/*global describe, beforeEach, it, inject, expect*/
 'use strict';
 
 describe('Navbar module', function () {

app/sidebar/sidebar.js

@@ -1,10 +1,9 @@
-/*global angular*/
 'use strict';
 
 angular.module('adagios.sidebar', [])
 
     .controller('SideBarCtrl', ['$scope', '$http', function ($scope, $http) {
-
+        return;
     }])
 
     .directive('sidebar', function () {

app/sidebar/sidebar_test.js

@@ -1,4 +1,3 @@
-/*global describe, beforeEach, it, inject, expect*/
 'use strict';
 
 describe('Sidebar module', function () {

app/tactical/current_health/current_health.js

@@ -1,4 +1,3 @@
-/*global angular*/
 'use strict';
 
 angular.module('adagios.tactical.current_health', ['ngRoute', 'ngJustGage' ])

app/tactical/current_health/current_health_test.js

@@ -1,4 +1,3 @@
-/*global describe, beforeEach, it, inject, expect*/
 'use strict';
 
 describe('Current Health tactical submodule', function () {

app/tactical/status_overview/status_overview.js

@@ -1,4 +1,3 @@
-/*global angular*/
 'use strict';
 
 angular.module('adagios.tactical.status_overview', ['ngRoute' ])

app/tactical/status_overview/status_overview_test.js

@@ -1,4 +1,3 @@
-/*global describe, beforeEach, it, inject, expect*/
 'use strict';
 
 describe('Status Overview tactical submodule', function () {

app/tactical/tactical.js

@@ -1,4 +1,3 @@
-/*global angular*/
 'use strict';
 
 angular.module('adagios.tactical', ['ngRoute',
@@ -15,4 +14,5 @@ angular.module('adagios.tactical', ['ngRoute',
     }])
 
     .controller('TacticalCtrl', ['$scope', '$http', function ($scope, $http) {
+        return;
     }]);

app/tactical/tactical_test.js

@@ -1,4 +1,3 @@
-/*global describe, beforeEach, it, inject, expect*/
 'use strict';
 
 describe('Tactical module', function () {

app/tactical/top_alert_producers/top_alert_producers.js

@@ -1,4 +1,3 @@
-/*global angular*/
 'use strict';
 
 angular.module('adagios.tactical.top_alert_producers', ['ngRoute' ])

app/tactical/top_alert_producers/top_alert_producers_test.js

@@ -1,4 +1,3 @@
-/*global describe, beforeEach, it, inject, expect*/
 'use strict';
 
 describe('Top Alert Producer tactical submodule', function () {

karma.conf.js

@@ -1,35 +1,37 @@
-module.exports = function(config){
+'use strict';
-  config.set({
 
-    basePath : './',
+module.exports = function (config) {
+    config.set({
 
-    files : [
+        basePath : './',
-      'app/bower_components/angular/angular.js',
-      'app/bower_components/angular-route/angular-route.js',
-      'app/bower_components/angular-mocks/angular-mocks.js',
-      'app/components/**/*.js',
-      'app/navbar/**/*.js',
-      'app/sidebar/**/*.js',
-      'app/tactical/**/*.js',
-    ],
 
-    autoWatch : true,
+        files : [
+            'app/bower_components/angular/angular.js',
+            'app/bower_components/angular-route/angular-route.js',
+            'app/bower_components/angular-mocks/angular-mocks.js',
+            'app/components/**/*.js',
+            'app/navbar/**/*.js',
+            'app/sidebar/**/*.js',
+            'app/tactical/**/*.js'
+        ],
 
-    frameworks: ['jasmine'],
+        autoWatch : true,
 
-    browsers : ['Chrome'],
+        frameworks: ['jasmine'],
 
-    plugins : [
+        browsers : ['Chrome'],
+
+        plugins : [
             'karma-chrome-launcher',
             'karma-firefox-launcher',
             'karma-jasmine',
             'karma-junit-reporter'
-            ],
+        ],
 
-    junitReporter : {
+        junitReporter : {
-      outputFile: 'test_out/unit.xml',
+            outputFile: 'test_out/unit.xml',
-      suite: 'unit'
+            suite: 'unit'
-    }
+        }
 
-  });
+    });
 };