[eslint] more fixes of the merged files

Author: ar2rsawseen

Gruntfile.js

@@ -202,21 +202,21 @@ module.exports = function(grunt) {
                 },
                 src: ['test/*/*.js']
             }
-    },
-	mocha_nyc: {
+        },
+        mocha_nyc: {
 	  coverage: {
 		  src: ['test/*/*.js'], // a folder works nicely
 		  options: {
-              coverage:true, // this will make the grunt.event.on('coverage') event listener to be triggered
+                    coverage: true, // this will make the grunt.event.on('coverage') event listener to be triggered
 			  mask: '*.js',
 			  excludes: ['bin/*', 'frontend/*', 'extend/*', 'Gruntfile.js', 'test/*'],
-              mochaOptions: ['--harmony', '--async-only', '--reporter', 'spec', '--timeout', '50000', '--exit'],
-              nycOptions: ['--harmony', '--clean', 'false'],//,'--include-all-sources' '--all'
-              reportFormats: ['none']
+                    mochaOptions: ['--harmony', '--async-only', '--reporter', 'spec', '--timeout', '50000', '--exit'],
+                    nycOptions: ['--harmony', '--clean', 'false'], //,'--include-all-sources' '--all'
+                    reportFormats: ['none']
 		  }
 	  }
-	},
-	istanbul_check_coverage: {
+        },
+        istanbul_check_coverage: {
 	  default: {
 		  options: {
 			  coverageFolder: 'coverage*', // will check both coverage folders and merge the coverage results
@@ -229,15 +229,15 @@ module.exports = function(grunt) {
         }
     });
 
-  //code coverage
-  grunt.event.on('coverage', function(lcovFileContents, done){
-	// Check below on the section "The coverage event"
-	done();
-  });
-  grunt.loadNpmTasks('grunt-mocha-nyc');
-  grunt.registerTask('coverage', ['mocha_nyc:coverage']);
-  //-----------code coverage-----------
- 
+    //code coverage
+    grunt.event.on('coverage', function(lcovFileContents, done) {
+        // Check below on the section "The coverage event"
+        done();
+    });
+    grunt.loadNpmTasks('grunt-mocha-nyc');
+    grunt.registerTask('coverage', ['mocha_nyc:coverage']);
+    //-----------code coverage-----------
+
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-concat');
     grunt.loadNpmTasks('grunt-contrib-uglify');
@@ -264,8 +264,8 @@ module.exports = function(grunt) {
   			plugins.push('push_approver');
   		}
   	}
-	  
-	if (plugins.indexOf('drill') !== -1) {
+
+        if (plugins.indexOf('drill') !== -1) {
             	if (plugins.indexOf('cohorts') !== -1) {
   			plugins.splice(plugins.indexOf('cohorts'), 1);
   			plugins.push('cohorts');
@@ -407,4 +407,4 @@ module.exports = function(grunt) {
 
     grunt.registerTask('dist-all', ['dist', 'plugins', 'locales']);
 
-};
+};

extend/mail.example.js

@@ -18,18 +18,19 @@ module.exports = function(mail) {
             pass: "password"
         }
     }));
-    
+
     mail.sendMail = function(message, callback) {
-        message.from = company+" <"+email+">";
-        mail.smtpTransport.sendMail(message, function (error) {
+        message.from = company + " <" + email + ">";
+        mail.smtpTransport.sendMail(message, function(error) {
             if (error) {
                 console.log('Error sending email');
                 console.log(error.message);
             }
-            if(callback)
+            if (callback) {
                 callback(error);
+            }
         });
-    }
+    };
 
     mail.sendMessage = function(to, subject, message, callback) {
         mail.sendMail({

plugins/assistant/frontend/public/javascripts/countly.views.js

@@ -31,7 +31,7 @@ window.AssistantView = {
         var notificationButtonID = "#notification-icon";
         var data = countlyAssistant.getDataForApp(countlyCommon.ACTIVE_APP_ID);
 
-        if(data.notifications === null || typeof data.notifications === "undefined"){
+        if (data.notifications === null || typeof data.notifications === "undefined") {
             //if this is null, assume that everything else is also
             //todo fix the circumstances that cause these cases
             data.notifications = [];

plugins/browser/tests.js

@@ -23,7 +23,7 @@ describe('Testing Browser metrics', function() {
                     }
                     var ob = JSON.parse(res.text);
                     ob.should.be.empty;
-				done();
+                    done();
                 });
         });
     });
@@ -39,7 +39,7 @@ describe('Testing Browser metrics', function() {
                     }
                     var ob = JSON.parse(res.text);
                     ob.should.have.property('result', 'Success');
-				setTimeout(done, 300 * testUtils.testScalingFactor)
+                    setTimeout(done, 300 * testUtils.testScalingFactor);
                 });
         });
     });
@@ -72,7 +72,7 @@ describe('Testing Browser metrics', function() {
                     }
                     var ob = JSON.parse(res.text);
                     ob.should.have.property('result', 'Success');
-				setTimeout(done, testUtils.testWaitTimeForDrillEvents * testUtils.testScalingFactor)
+                    setTimeout(done, testUtils.testWaitTimeForDrillEvents * testUtils.testScalingFactor);
                 });
         });
     });
@@ -98,7 +98,7 @@ describe('Testing Browser metrics', function() {
                     }
                     var ob = JSON.parse(res.text);
                     ob.should.have.property('result', 'Success');
-				setTimeout(done, 10 * testUtils.testScalingFactor)
+                    setTimeout(done, 10 * testUtils.testScalingFactor);
                 });
         });
     });
@@ -113,7 +113,7 @@ describe('Testing Browser metrics', function() {
                     }
                     var ob = JSON.parse(res.text);
                     ob.should.be.empty;
-				done();
+                    done();
                 });
         });
     });