Merge branch 'CLIMATE-945' of https://github.com/MichaelArthurAnderso…

…n/climate
apache · Jan 17, 2018 · 3be7da8 · 3be7da8
2 parents d4d2eab + ac52e38
commit 3be7da8
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/ocw-ui/frontend/.jscsrc b/ocw-ui/frontend/.jscsrc
@@ -0,0 +1,17 @@
+{
+  "disallowTrailingWhitespace": true,
+  "disallowUnusedParams": true,
+  "disallowUnusedVariables": true,
+   "requireCapitalizedComments": true,
+  "requireCurlyBraces": true,
+  "requireDotNotation": true,
+  "requireLineFeedAtFileEnd": true,
+  "requireSemicolons": true,
+  "requireSpaceAfterComma": true,
+  "requireSpaceAfterLineComment": true,
+  "requireSpaceBetweenArguments": true,
+  "requireSpacesInConditionalExpression": true,
+  "requireTemplateStrings": true,
+  "requireYodaConditions": true,
+  "validateQuoteMarks": "'"
+}
diff --git a/ocw-ui/frontend/Gruntfile.js b/ocw-ui/frontend/Gruntfile.js
@@ -132,6 +132,14 @@ module.exports = function (grunt) {
       }
     },
 
+    // Supplements jshint with a focus on style.
+    jscs: {
+      src: '<%= yeoman.app %>/scripts/{,*/}*.js',
+      options: {
+        config: ".jscsrc",
+        fix: false
+      }
+    },
     // Empties folders to start fresh
     clean: {
       dist: {
@@ -408,6 +416,7 @@ module.exports = function (grunt) {
 
   grunt.registerTask('default', [
     'newer:jshint',
+    'jscs',
     'test',
     'build'
   ]);

diff --git a/ocw-ui/frontend/app/views/modelselect.html b/ocw-ui/frontend/app/views/modelselect.html
@@ -54,7 +54,7 @@
             </div>
             <div class="control-group">
               <label class="control-label" for="lonSelect">Longitude Variable</label>
-              <div class"controls">
+              <div class="controls">
                 <select id="lonSelect">
                   <option ng-repeat="lon in lonVariables">
                     {{lon.text}}

diff --git a/ocw-ui/frontend/package.json b/ocw-ui/frontend/package.json
@@ -14,6 +14,7 @@
     "generator-angular": "^0.9.5",
     "generator-karma": "^0.8.3",
     "grunt": "^0.4.1",
+    "grunt-jscs": "^3.0.1",
     "grunt-autoprefixer": "^0.7.3",
     "grunt-cli": "^0.1.13",
     "grunt-concurrent": "^0.5.0",
@@ -32,6 +33,7 @@
     "grunt-google-cdn": "^0.4.0",
     "grunt-karma": "^0.12.2",
     "grunt-newer": "^0.7.0",
+    "grunt-ngmin": "^0.0.3",
     "grunt-ng-annotate": "^0.1.0",
     "grunt-svgmin": "^0.4.0",
     "grunt-usemin": "^2.1.1",