Repository: climate Updated Branches: refs/heads/master d4d2eab5d -> 3be7da888
CLIMATE-945 Grunt Errors On Build Task Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/2dd6b516 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/2dd6b516 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/2dd6b516 Branch: refs/heads/master Commit: 2dd6b5163fb5e27bfae62561ccb34429a535f8d4 Parents: 4cf79f3 Author: Michael Anderson <michaelanderson@Michaels-iMac.local> Authored: Sun Jan 7 07:22:03 2018 -0500 Committer: Michael Anderson <michaelanderson@Michaels-iMac.local> Committed: Sun Jan 7 07:22:03 2018 -0500 ---------------------------------------------------------------------- ocw-ui/frontend/.jscsrc | 17 +++++++++++++++++ ocw-ui/frontend/Gruntfile.js | 9 +++++++++ ocw-ui/frontend/app/views/modelselect.html | 2 +- ocw-ui/frontend/package.json | 6 ++++-- 4 files changed, 31 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/2dd6b516/ocw-ui/frontend/.jscsrc ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend/.jscsrc b/ocw-ui/frontend/.jscsrc new file mode 100644 index 0000000..cb61269 --- /dev/null +++ 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": "'" +} http://git-wip-us.apache.org/repos/asf/climate/blob/2dd6b516/ocw-ui/frontend/Gruntfile.js ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend/Gruntfile.js b/ocw-ui/frontend/Gruntfile.js index a58f762..43757c8 100644 --- 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' ]); http://git-wip-us.apache.org/repos/asf/climate/blob/2dd6b516/ocw-ui/frontend/app/views/modelselect.html ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend/app/views/modelselect.html b/ocw-ui/frontend/app/views/modelselect.html index 9bc128f..6c6f8ba 100644 --- a/ocw-ui/frontend/app/views/modelselect.html +++ b/ocw-ui/frontend/app/views/modelselect.html @@ -54,7 +54,7 @@ under the License. </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}} http://git-wip-us.apache.org/repos/asf/climate/blob/2dd6b516/ocw-ui/frontend/package.json ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend/package.json b/ocw-ui/frontend/package.json index 8024f17..553e4b1 100644 --- a/ocw-ui/frontend/package.json +++ b/ocw-ui/frontend/package.json @@ -2,8 +2,8 @@ "name": "ocwui", "version": "1.2.0", "description": "A tool for the evaluation and analysis of climate models.", - "repository": { - "type" : "git", + "repository": { + "type" : "git", "url" : "https://git-wip-us.apache.org/repos/asf/climate.git"; }, "license": "Apache-2.0", @@ -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", @@ -31,6 +32,7 @@ "grunt-google-cdn": "^0.4.0", "grunt-karma": "^0.8.3", "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",
