diff --git a/.jshintrc b/.jshintrc index a8e18932fd..df3f02a1ff 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,4 +1,22 @@ { - "validthis": true, - "laxbreak": true + "bitwise": true, + "browser": true, + "curly": true, + "eqeqeq": true, + "forin": true, + "freeze": true, + "funcscope": true, + "futurehostile": true, + "latedef": true, + "noarg": true, + "nocomma": true, + "nonbsp": true, + "nonew": true, + "predef": [ + "define", + "Promise" + ], + "strict": "implied", + "undef": true, + "unused": "vars" } diff --git a/circle.yml b/circle.yml index d163b3ee0c..472fdf7c17 100644 --- a/circle.yml +++ b/circle.yml @@ -1,18 +1,16 @@ deployment: production: branch: master - commands: - - npm install canvas nomnoml - - ./build-docs.sh - - git push git@heroku.com:openmctweb-demo.git $CIRCLE_SHA1:refs/heads/master - openmctweb-staging-un: - branch: nem_prototype heroku: - appname: openmctweb-staging-un + appname: openmctweb-demo + openmct-demo: + branch: live_demo + heroku: + appname: openmct-demo openmctweb-staging-deux: branch: mobile heroku: appname: openmctweb-staging-deux test: post: - - npm run jshint --silent + - gulp lint diff --git a/docs/footer.html b/docs/footer.html index e4e5daee87..a6878b0cac 100644 --- a/docs/footer.html +++ b/docs/footer.html @@ -1,9 +1,3 @@