Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

CLIMATE-945 Grunt Errors On Build Task #490

Merged
merged 2 commits into from
Jan 17, 2018
Merged

CLIMATE-945 Grunt Errors On Build Task #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dd6b51
CLIMATE-945 Grunt Errors On Build Task
Jan 7, 2018
ac52e38
Merge branch 'master' into CLIMATE-945
MichaelArthurAnderson Jan 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 17 additions & 0 deletions ocw-ui/frontend/.jscsrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": "'"
}
9 changes: 9 additions & 0 deletions ocw-ui/frontend/Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -408,6 +416,7 @@ module.exports = function (grunt) {

grunt.registerTask('default', [
'newer:jshint',
'jscs',
'test',
'build'
]);
Expand Down
2 changes: 1 addition & 1 deletion ocw-ui/frontend/app/views/modelselect.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
2 changes: 2 additions & 0 deletions ocw-ui/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down