From d1f3e5f74a5f0a373735c167fbc8d0785578b73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Di=20Biase?= Date: Fri, 23 Jun 2017 14:54:28 -0300 Subject: [PATCH] match jshintrc config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Luis Di Biase --- .jshintrc | 7 ++++++- app/controllers/forms.server.controller.js | 4 ++-- .../users.authentication.server.controller.js | 8 ++++---- .../users/users.password.server.controller.js | 8 ++++---- app/libs/tokenGenerator.js | 4 ++-- app/models/form.server.model.js | 2 +- config/config.js | 2 +- config/env/all.js | 12 ++++++------ config/passport_helpers.js | 12 ++++++------ config/strategies/apikey.js | 10 +++++----- .../submit-form.client.directive.js | 19 ++++++++++--------- .../analytics-service.client.directive.js | 6 +++--- .../admin-form.client.controller.js | 4 ++-- .../list-forms.client.controller.js | 2 +- .../directives/edit-form.client.directive.js | 4 +++- .../edit-submissions-form.client.directive.js | 2 +- .../analytics-service.client.directive.js | 2 +- .../edit-form.client.directive.test.js | 2 +- 18 files changed, 59 insertions(+), 51 deletions(-) diff --git a/.jshintrc b/.jshintrc index afb53268..94d52d77 100755 --- a/.jshintrc +++ b/.jshintrc @@ -24,7 +24,12 @@ "_": true, "saveAs": true, "ApplicationConfiguration": true, - "Session": true + "Session": true, + "$": true, + "$window": true, + "io": true, + "jsep": true, + "MobileDetect": true }, "predef": [ // Extra globals. "define", diff --git a/app/controllers/forms.server.controller.js b/app/controllers/forms.server.controller.js index 14db9f8f..98945afb 100644 --- a/app/controllers/forms.server.controller.js +++ b/app/controllers/forms.server.controller.js @@ -50,7 +50,7 @@ exports.createSubmission = function(req, res) { var timeElapsed = 0; - if(typeof req.body.timeElapsed === "number"){ + if(typeof req.body.timeElapsed === 'number'){ timeElapsed = req.body.timeElapsed; } var submission = new FormSubmission({ @@ -114,7 +114,7 @@ exports.create = function(req, res) { if(!req.body.form){ return res.status(400).send({ - message: "Invalid Input" + message: 'Invalid Input' }); } var form = new Form(req.body.form); diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js index f944e544..5df70a03 100755 --- a/app/controllers/users/users.authentication.server.controller.js +++ b/app/controllers/users/users.authentication.server.controller.js @@ -8,7 +8,7 @@ var errorHandler = require('../errors.server.controller'), passport = require('passport'), config = require('../../../config/config'), User = mongoose.model('User'), - tokgen = require("../../libs/tokenGenerator"); + tokgen = require('../../libs/tokenGenerator'); var nev = require('email-verification')(mongoose); @@ -122,7 +122,7 @@ exports.signup = function(req, res) { } return res.status(200).send('An email has been sent to you. Please check it to verify your account.'); }); - } + } return res.status(400).send({message: 'Error: User already exists!'}); }); }; @@ -238,7 +238,7 @@ exports.saveOAuthUserProfile = function(req, providerUserProfile, done) { // Check if user exists, is not signed in using this provider, and doesn't have that provider data already configured if (user.provider !== providerUserProfile.provider && (!user.additionalProvidersData || !user.additionalProvidersData[providerUserProfile.provider])) { // Add the provider data to the additional provider data field - if (!user.additionalProvidersData) { + if (!user.additionalProvidersData) { user.additionalProvidersData = {}; } user.additionalProvidersData[providerUserProfile.provider] = providerUserProfile.providerData; @@ -303,7 +303,7 @@ exports.generateAPIKey = function(req, res) { if (err) { return res.status(400).send(err); } - + if (!user) { return res.status(400).send({ message: 'User does not Exist' diff --git a/app/controllers/users/users.password.server.controller.js b/app/controllers/users/users.password.server.controller.js index f09c42a5..a9f2596e 100755 --- a/app/controllers/users/users.password.server.controller.js +++ b/app/controllers/users/users.password.server.controller.js @@ -66,7 +66,7 @@ exports.forgot = function(req, res, next) { }, function(token, user, done) { res.render('templates/reset-password-email', { - name: user.displayName || "TellForm User", + name: user.displayName || 'TellForm User', appName: config.app.title, url: 'http://' + req.headers.host + '/auth/reset/' + token }, function(err, emailHTML) { @@ -146,7 +146,7 @@ exports.reset = function(req, res, next) { user.save(function(err) { if (err) { - done(err, null) + done(err, null); } done(null, user); }); @@ -154,7 +154,7 @@ exports.reset = function(req, res, next) { done('Passwords do not match', null); } } else { - done('Password reset token is invalid or has expired.', null) + done('Password reset token is invalid or has expired.', null); } }); }, @@ -187,7 +187,7 @@ exports.reset = function(req, res, next) { } return res.json({ - message: "Successfully changed your password!" + message: 'Successfully changed your password!' }); }); }; diff --git a/app/libs/tokenGenerator.js b/app/libs/tokenGenerator.js index 2fd3c5c3..142b0b0e 100644 --- a/app/libs/tokenGenerator.js +++ b/app/libs/tokenGenerator.js @@ -1,6 +1,6 @@ -"use strict"; +'use strict'; -var TokenGenerator = require("uuid-token-generator"); +var TokenGenerator = require('uuid-token-generator'); var tokgen = new TokenGenerator(256, TokenGenerator.BASE62); module.exports = function() { diff --git a/app/models/form.server.model.js b/app/models/form.server.model.js index 52051da8..9de896bf 100644 --- a/app/models/form.server.model.js +++ b/app/models/form.server.model.js @@ -215,7 +215,7 @@ FormSchema.virtual('analytics.fields').get(function () { var visitors = this.analytics.visitors; var that = this; - if(this.form_fields.length == 0) { + if(this.form_fields.length === 0) { return null; } diff --git a/config/config.js b/config/config.js index e085589c..a39c29fb 100755 --- a/config/config.js +++ b/config/config.js @@ -94,7 +94,7 @@ module.exports._getAssets = function(includeTests, isFormJS){ } return output; -} +}; /** * Get the modules JavaScript files diff --git a/config/env/all.js b/config/env/all.js index a4434a60..d7b05d65 100755 --- a/config/env/all.js +++ b/config/env/all.js @@ -15,9 +15,9 @@ module.exports = { } }, aws: { - "accessKeyId": process.env.AWS_ACCESS_ID, - "secretAccessKey": process.env.AWS_SECRET_KEY, - "region": process.env.AWS_REGION + 'accessKeyId': process.env.AWS_ACCESS_ID, + 'secretAccessKey': process.env.AWS_SECRET_KEY, + 'region': process.env.AWS_REGION }, port: process.env.PORT || 3000, @@ -27,8 +27,8 @@ module.exports = { reCAPTCHA_Key: process.env.reCAPTCHA_KEY || '', - signupDisabled: (process.env.SIGNUP_DISABLED === "TRUE"), - disableClusterMode: (process.env.DISABLE_CLUSTER_MODE === "TRUE"), + signupDisabled: (process.env.SIGNUP_DISABLED === 'TRUE'), + disableClusterMode: (process.env.DISABLE_CLUSTER_MODE === 'TRUE'), baseUrl: '', tempUserCollection: 'temporary_users', @@ -37,7 +37,7 @@ module.exports = { mailbox_id: process.env.MAILOSAUR_MAILBOX || '' }, - subdomainsDisabled: (process.env.SUBDOMAINS_DISABLED == "TRUE"), + subdomainsDisabled: (process.env.SUBDOMAINS_DISABLED === 'TRUE'), //Sentry DSN Client Key DSN: process.env.RAVEN_DSN || '', diff --git a/config/passport_helpers.js b/config/passport_helpers.js index c7b8f4f8..cb861289 100644 --- a/config/passport_helpers.js +++ b/config/passport_helpers.js @@ -1,6 +1,6 @@ -"use strict"; +'use strict'; -var passport = require("passport"); +var passport = require('passport'); module.exports.isAuthenticatedOrApiKey = function isAuthenticated(req, res, next) { if (req.isAuthenticated()) { @@ -8,12 +8,12 @@ module.exports.isAuthenticatedOrApiKey = function isAuthenticated(req, res, next } // Try authenticate with API KEY if (req.headers.apikey || req.query.apikey || req.body.apikey) { - passport.authenticate("localapikey", function (err, user, info) { + passport.authenticate('localapikey', function (err, user, info) { if (err) return res.sendStatus(500); if (!user) - return res.status(401).send(info.message || ""); + return res.status(401).send(info.message || ''); req.login(user, function(loginErr) { if (loginErr) return res.sendStatus(500); @@ -31,7 +31,7 @@ module.exports.isAuthenticatedOrApiKey = function isAuthenticated(req, res, next module.exports.hasRole = function hasRole(roleRequired) { if (!roleRequired) { - throw new Error("Required role needs to be set"); + throw new Error('Required role needs to be set'); } return function(req, res, next) { @@ -45,6 +45,6 @@ module.exports.hasRole = function hasRole(roleRequired) { }; module.exports.hasAdminRole = function hasAdminRole() { - return module.exports.hasRole("admin"); + return module.exports.hasRole('admin'); }; diff --git a/config/strategies/apikey.js b/config/strategies/apikey.js index d9dc6e0c..c4fdf389 100644 --- a/config/strategies/apikey.js +++ b/config/strategies/apikey.js @@ -1,7 +1,7 @@ -"use strict"; +'use strict'; -var passport = require("passport"); -var LocalAPIKeyStrategy = require("passport-localapikey-update").Strategy; +var passport = require('passport'); +var LocalAPIKeyStrategy = require('passport-localapikey-update').Strategy; var User = require('mongoose').model('User'); module.exports = function() { @@ -9,14 +9,14 @@ module.exports = function() { passReqToCallback : true }, function(req, apiKey, done) { return User.findOne({ - "apiKey": apiKey + 'apiKey': apiKey }, function(err, user) { if (err) return done(err); if (!user) return done(null, false, { - message: "Unknown API Key" + message: 'Unknown API Key' }); return done(null, user); diff --git a/public/form_modules/forms/base/directives/submit-form.client.directive.js b/public/form_modules/forms/base/directives/submit-form.client.directive.js index d1c043c1..f6ae4786 100644 --- a/public/form_modules/forms/base/directives/submit-form.client.directive.js +++ b/public/form_modules/forms/base/directives/submit-form.client.directive.js @@ -2,12 +2,12 @@ //FIXME: Should find an appropriate place for this //Setting up jsep -jsep.addBinaryOp("contains", 10); -jsep.addBinaryOp("!contains", 10); -jsep.addBinaryOp("begins", 10); -jsep.addBinaryOp("!begins", 10); -jsep.addBinaryOp("ends", 10); -jsep.addBinaryOp("!ends", 10); +jsep.addBinaryOp('contains', 10); +jsep.addBinaryOp('!contains', 10); +jsep.addBinaryOp('begins', 10); +jsep.addBinaryOp('!begins', 10); +jsep.addBinaryOp('ends', 10); +jsep.addBinaryOp('!ends', 10); angular.module('view-form').directive('submitFormDirective', ['$http', 'TimeCounter', '$filter', '$rootScope', 'SendVisitorData', function ($http, TimeCounter, $filter, $rootScope, SendVisitorData) { @@ -141,6 +141,7 @@ angular.module('view-form').directive('submitFormDirective', ['$http', 'TimeCoun case 'contains': return (left.indexOf(right) > -1); case '!contains': + /* jshint -W018 */ return !(left.indexOf(right) > -1); case 'begins': return left.startsWith(right); @@ -297,9 +298,9 @@ angular.module('view-form').directive('submitFormDirective', ['$http', 'TimeCoun var getIpAndGeo = function(){ //Get Ip Address and GeoLocation Data - $.ajaxSetup( { "async": false } ); + $.ajaxSetup( { 'async': false } ); var geoData = $.getJSON('https://freegeoip.net/json/').responseJSON; - $.ajaxSetup( { "async": true } ); + $.ajaxSetup( { 'async': true } ); return { ipAddr: geoData.ip, @@ -307,7 +308,7 @@ angular.module('view-form').directive('submitFormDirective', ['$http', 'TimeCoun City: geoData.city, Country: geoData.country_name } - } + }; }; $rootScope.submitForm = $scope.submitForm = function() { diff --git a/public/form_modules/forms/directives/analytics-service.client.directive.js b/public/form_modules/forms/directives/analytics-service.client.directive.js index 7f19525d..7ffc38a4 100644 --- a/public/form_modules/forms/directives/analytics-service.client.directive.js +++ b/public/form_modules/forms/directives/analytics-service.client.directive.js @@ -28,16 +28,16 @@ deviceType = 'desktop'; } - $.ajaxSetup( { "async": false } ); + $.ajaxSetup( { 'async': false } ); var geoData = $.getJSON('https://freegeoip.net/json/').responseJSON; - $.ajaxSetup( { "async": true } ); + $.ajaxSetup( { 'async': true } ); if(!geoData){ geoData = { ip: '', city: '', country_name: '' - } + }; } // Create a new message object diff --git a/public/modules/forms/admin/controllers/admin-form.client.controller.js b/public/modules/forms/admin/controllers/admin-form.client.controller.js index c770a30f..82e0da11 100644 --- a/public/modules/forms/admin/controllers/admin-form.client.controller.js +++ b/public/modules/forms/admin/controllers/admin-form.client.controller.js @@ -23,10 +23,10 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$windo CurrentForm.setForm($scope.myform); - $scope.formURL = "/#!/forms/" + $scope.myform._id; + $scope.formURL = '/#!/forms/' + $scope.myform._id; if ($scope.myform.isLive) { - if ($window.subdomainsDisabled == true) { + if ($window.subdomainsDisabled === true) { $scope.actualFormURL = window.location.protocol + '//' + window.location.host + '/view' + $scope.formURL; } else { if (window.location.host.split('.').length < 3) { diff --git a/public/modules/forms/admin/controllers/list-forms.client.controller.js b/public/modules/forms/admin/controllers/list-forms.client.controller.js index 23d24568..cf87b4e5 100644 --- a/public/modules/forms/admin/controllers/list-forms.client.controller.js +++ b/public/modules/forms/admin/controllers/list-forms.client.controller.js @@ -29,7 +29,7 @@ angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope $scope.deleteForm = function() { $scope.$parent.removeForm(items.formIndex); - } + }; }, resolve: { items: function() { diff --git a/public/modules/forms/admin/directives/edit-form.client.directive.js b/public/modules/forms/admin/directives/edit-form.client.directive.js index 48712e0f..48d0420b 100644 --- a/public/modules/forms/admin/directives/edit-form.client.directive.js +++ b/public/modules/forms/admin/directives/edit-form.client.directive.js @@ -14,6 +14,8 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField /* ** Initialize scope with variables */ + var newField; + //Setup UI-Sortable $scope.sortableOptions = { appendTo: '.dropzone', @@ -282,7 +284,7 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField break; } } - var newField = { + newField = { title: fieldTitle, fieldType: fieldType, fieldValue: '', diff --git a/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js b/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js index 9f2b841c..b3962e0a 100644 --- a/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js +++ b/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js @@ -113,7 +113,7 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope', var updateFields = $interval(initController, 2000); - $scope.$on("$destroy", function() { + $scope.$on('$destroy', function() { if (updateFields) { $interval.cancel($scope.updateFields); } diff --git a/public/modules/forms/directives/analytics-service.client.directive.js b/public/modules/forms/directives/analytics-service.client.directive.js index 46a40bbe..a1206ca2 100644 --- a/public/modules/forms/directives/analytics-service.client.directive.js +++ b/public/modules/forms/directives/analytics-service.client.directive.js @@ -1,5 +1,5 @@ (function () { - "use strict"; + 'use strict'; function SendVisitorData() { diff --git a/public/modules/forms/tests/unit/directives/edit-form.client.directive.test.js b/public/modules/forms/tests/unit/directives/edit-form.client.directive.test.js index 49b264d8..2e0363f5 100644 --- a/public/modules/forms/tests/unit/directives/edit-form.client.directive.test.js +++ b/public/modules/forms/tests/unit/directives/edit-form.client.directive.test.js @@ -89,7 +89,7 @@ if(cb){ cb(); } - } + }; }));