TSLint format fixes (Part 1)

MKHenson · Oct 17, 2016 · 37ff605 · 37ff605
1 parent d20523f
commit 37ff605
Show file tree

Hide file tree

Showing 37 changed files with 763 additions and 777 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -67,4 +67,4 @@ gulp.task( 'bump-patch', function() { return setup.bumpVersion( setup.bumpPatchN
 gulp.task( 'bump-minor', function() { return setup.bumpVersion( setup.bumpMidNum, configFiles ) });
 gulp.task( 'bump-major', function() { return setup.bumpVersion( setup.bumpMajorNum, configFiles ) });
 gulp.task( 'install', [ 'install-definitions' ] );
-gulp.task( 'build', [ 'ts-code', 'dist-files', 'ts-code-definitions' ] );
+gulp.task( 'build', [ 'tslint', 'dist-files', 'ts-code-definitions' ] );
diff --git a/src/controllers/comments-controller.ts b/src/controllers/comments-controller.ts
diff --git a/src/controllers/controller.ts b/src/controllers/controller.ts
@@ -1,7 +1,7 @@
-import { Model, ModelInstance } from "../models/model";
-import * as mongodb from "mongodb";
-import { IControllerPlugin } from "modepress-api";
-import { okJson, errJson } from "../serializers";
+import { Model, ModelInstance } from '../models/model';
+import * as mongodb from 'mongodb';
+import { IControllerPlugin } from 'modepress-api';
+import { okJson, errJson } from '../serializers';
 
 export class Controller {
     private static _models: Array<Model> = [];
@@ -11,10 +11,10 @@ export class Controller {
         this._models = [];
 
         if ( models ) {
-            for ( var ii = 0, il = models.length; ii < il; ii++ ) {
-                var modelAlreadyAdded = false;
+            for ( let ii = 0, il = models.length; ii < il; ii++ ) {
+                let modelAlreadyAdded = false;
 
-                for ( var i = 0, l = Controller._models.length; i < l; i++ )
+                for ( let i = 0, l = Controller._models.length; i < l; i++ )
                     if ( Controller._models[ i ].collectionName == models[ ii ].collectionName ) {
                         modelAlreadyAdded = true;
                         break;
@@ -37,8 +37,8 @@ export class Controller {
             return this;
 
         // Start the initialization of all of the models
-        var promises: Array<Promise<Model>> = [];
-        for ( var i = 0, l = this._models.length; i < l; i++ )
+        const promises: Array<Promise<Model>> = [];
+        for ( let i = 0, l = this._models.length; i < l; i++ )
             promises.push( this._models[ i ].initialize( db ) );
 
 
@@ -52,8 +52,8 @@ export class Controller {
 	 * Gets a model by its collection name
 	 */
     getModel( collectionName: string ): Model | null {
-        var models = Controller._models;
-        for ( var i = 0, l = models.length; i < l; i++ )
+        const models = Controller._models;
+        for ( let i = 0, l = models.length; i < l; i++ )
             if ( models[ i ].collectionName == collectionName )
                 return models[ i ];
 

diff --git a/src/controllers/cors-controller.ts b/src/controllers/cors-controller.ts
@@ -1,10 +1,10 @@
-import * as mongodb from "mongodb";
-import * as http from "http";
-import { IServer } from "modepress-api";
-import * as winston from "winston";
-import { Controller } from "./controller";
-import { okJson, errJson } from "../serializers";
-import express = require( "express" );
+import * as mongodb from 'mongodb';
+import * as http from 'http';
+import { IServer } from 'modepress-api';
+import * as winston from 'winston';
+import { Controller } from './controller';
+import { okJson, errJson } from '../serializers';
+import express = require( 'express' );
 
 /**
  * Checks all incomming requests to see if they are CORS approved
@@ -16,20 +16,20 @@ export default class CORSController extends Controller {
     constructor( e: express.Express, config: IServer ) {
         super( null );
 
-        var matches: Array<RegExp> = [];
-        for ( var i = 0, l = config.approvedDomains.length; i < l; i++ )
+        const matches: Array<RegExp> = [];
+        for ( let i = 0, l = config.approvedDomains.length; i < l; i++ )
             matches.push( new RegExp( config.approvedDomains[ i ] ) );
 
         // Approves the valid domains for CORS requests
         e.use( function( req: express.Request, res: express.Response, next: Function ) {
             if ( ( <http.ServerRequest>req ).headers.origin ) {
-                var matched = false;
-                for ( var m = 0, l = matches.length; m < l; m++ )
+                let matched = false;
+                for ( let m = 0, l = matches.length; m < l; m++ )
                     if ( ( <http.ServerRequest>req ).headers.origin.match( matches[ m ] ) ) {
                         res.setHeader( 'Access-Control-Allow-Origin', ( <http.ServerRequest>req ).headers.origin );
                         res.setHeader( 'Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS' );
                         res.setHeader( 'Access-Control-Allow-Headers', 'Content-Type, Authorization, Content-Length, X-Requested-With, X-Mime-Type, X-File-Name, Cache-Control' );
-                        res.setHeader( "Access-Control-Allow-Credentials", "true" );
+                        res.setHeader( 'Access-Control-Allow-Credentials', 'true' );
                         matched = true;
                         break;
                     }

diff --git a/src/controllers/emails-controller.ts b/src/controllers/emails-controller.ts
@@ -1,10 +1,10 @@
-import express = require( "express" );
-import controllerModule = require( "./controller" );
+import express = require( 'express' );
+import controllerModule = require( './controller' );
 import bodyParser = require( 'body-parser' );
-import { UsersService } from "../users-service"
-import { IConfig, IServer, IMessage } from "modepress-api";
-import { okJson, errJson } from "../serializers";
-import * as winston from "winston";
+import { UsersService } from '../users-service'
+import { IConfig, IServer, IMessage } from 'modepress-api';
+import { okJson, errJson } from '../serializers';
+import * as winston from 'winston';
 
 export default class EmailsController extends controllerModule.Controller {
 	/**
@@ -19,16 +19,16 @@ export default class EmailsController extends controllerModule.Controller {
         server; // Supress empty param warning
         config; // Supress empty param warning
 
-        var router = express.Router();
+        const router = express.Router();
         router.use( bodyParser.urlencoded( { 'extended': true }) );
         router.use( bodyParser.json() );
         router.use( bodyParser.json( { type: 'application/vnd.api+json' }) );
 
         // Filter the post requests
-        router.post( "/", this.onPost.bind( this ) );
+        router.post( '/', this.onPost.bind( this ) );
 
         // Register the path
-        e.use( "/api/message-admin", router );
+        e.use( '/api/message-admin', router );
     }
 
 	/**
@@ -38,7 +38,7 @@ export default class EmailsController extends controllerModule.Controller {
         // Set the content type
         res.setHeader( 'Content-Type', 'application/json' );
 
-        var message: string = `Hello admin,
+        const message: string = `Hello admin,
 			We have received a message from ${( <IMessage>req.body ).name}:
 
 			${( <IMessage>req.body ).message}