Fixing Indentation Convention to TABS

meanjs · Feb 10, 2014 · c1213e9 · c1213e9
1 parent eae6f2d
commit c1213e9
Show file tree

Hide file tree

Showing 18 changed files with 417 additions and 422 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -1,8 +1,3 @@
 {
-	"directory": "public/lib",
-	"storage": {
-		"packages": ".bower-cache",
-		"registry": ".bower-registry"
-	},
-	"tmp": ".bower-tmp"
+	"directory": "public/lib"
 }
diff --git a/.jshintrc b/.jshintrc
@@ -1,41 +1,41 @@
 {
-    "node": true, // Enable globals available when code is running inside of the NodeJS runtime environment.
-    "browser": true, // Standard browser globals e.g. `window`, `document`.
-    "esnext": true, // Allow ES.next specific features such as `const` and `let`.
-    "bitwise": false, // Prohibit bitwise operators (&, |, ^, etc.).
-    "camelcase": false, // Permit only camelcase for `var` and `object indexes`.
-    "curly": false, // Require {} for every new block or scope.
-    "eqeqeq": true, // Require triple equals i.e. `===`.
-    "immed": true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
-    "latedef": true, // Prohibit variable use before definition.
-    "newcap": true, // Require capitalization of all constructor functions e.g. `new F()`.
-    "noarg": true, // Prohibit use of `arguments.caller` and `arguments.callee`.
-    "quotmark": "single", // Define quotes to string values.
-    "regexp": true, // Prohibit `.` and `[^...]` in regular expressions.
-    "undef": true, // Require all non-global variables be declared before they are used.
-    "unused": false, // Warn unused variables.
-    "strict": true, // Require `use strict` pragma in every file.
-    "trailing": true, // Prohibit trailing whitespaces.
-    "smarttabs": false, // Suppresses warnings about mixed tabs and spaces
-    "globals": { // Globals variables.
-        "angular": true,
-        "ApplicationConfiguration": true
-    },
-    "predef": [ // Extra globals.
-        "define",
-        "require",
-        "exports",
-        "module",
-        "describe",
-        "before",
-        "beforeEach",
-        "after",
-        "afterEach",
-        "it",
-        "inject",
-        "expect"
-    ],
-    "indent": 4, // Specify indentation spacing
-    "devel": true, // Allow development statements e.g. `console.log();`.
-    "noempty": true // Prohibit use of empty blocks.
+	"node": true, // Enable globals available when code is running inside of the NodeJS runtime environment.
+	"browser": true, // Standard browser globals e.g. `window`, `document`.
+	"esnext": true, // Allow ES.next specific features such as `const` and `let`.
+	"bitwise": false, // Prohibit bitwise operators (&, |, ^, etc.).
+	"camelcase": false, // Permit only camelcase for `var` and `object indexes`.
+	"curly": false, // Require {} for every new block or scope.
+	"eqeqeq": true, // Require triple equals i.e. `===`.
+	"immed": true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
+	"latedef": true, // Prohibit variable use before definition.
+	"newcap": true, // Require capitalization of all constructor functions e.g. `new F()`.
+	"noarg": true, // Prohibit use of `arguments.caller` and `arguments.callee`.
+	"quotmark": "single", // Define quotes to string values.
+	"regexp": true, // Prohibit `.` and `[^...]` in regular expressions.
+	"undef": true, // Require all non-global variables be declared before they are used.
+	"unused": false, // Warn unused variables.
+	"strict": true, // Require `use strict` pragma in every file.
+	"trailing": true, // Prohibit trailing whitespaces.
+	"smarttabs": false, // Suppresses warnings about mixed tabs and spaces
+	"globals": { // Globals variables.
+		"angular": true,
+		"ApplicationConfiguration": true
+	},
+	"predef": [ // Extra globals.
+		"define",
+		"require",
+		"exports",
+		"module",
+		"describe",
+		"before",
+		"beforeEach",
+		"after",
+		"afterEach",
+		"it",
+		"inject",
+		"expect"
+	],
+	"indent": 4, // Specify indentation spacing
+	"devel": true, // Allow development statements e.g. `console.log();`.
+	"noempty": true // Prohibit use of empty blocks.
 }
diff --git a/app/controllers/articles.js b/app/controllers/articles.js
@@ -4,104 +4,104 @@
  * Module dependencies.
  */
 var mongoose = require('mongoose'),
-    Article = mongoose.model('Article'),
-    _ = require('lodash');
+	Article = mongoose.model('Article'),
+	_ = require('lodash');
 
 /**
  * Create a article
  */
 exports.create = function(req, res) {
-    var article = new Article(req.body);
-    article.user = req.user;
+	var article = new Article(req.body);
+	article.user = req.user;
 
-    article.save(function(err) {
-        if (err) {
-            return res.send('users/signup', {
-                errors: err.errors,
-                article: article
-            });
-        } else {
-            res.jsonp(article);
-        }
-    });
+	article.save(function(err) {
+		if (err) {
+			return res.send('users/signup', {
+				errors: err.errors,
+				article: article
+			});
+		} else {
+			res.jsonp(article);
+		}
+	});
 };
 
 /**
  * Show the current article
  */
 exports.read = function(req, res) {
-    res.jsonp(req.article);
+	res.jsonp(req.article);
 };
 
 /**
  * Update a article
  */
 exports.update = function(req, res) {
-    var article = req.article;
+	var article = req.article;
 
-    article = _.extend(article, req.body);
+	article = _.extend(article, req.body);
 
-    article.save(function(err) {
-        if (err) {
-            res.render('error', {
-                status: 500
-            });
-        } else {
-            res.jsonp(article);
-        }
-    });
+	article.save(function(err) {
+		if (err) {
+			res.render('error', {
+				status: 500
+			});
+		} else {
+			res.jsonp(article);
+		}
+	});
 };
 
 /**
  * Delete an article
  */
 exports.delete = function(req, res) {
-    var article = req.article;
+	var article = req.article;
 
-    article.remove(function(err) {
-        if (err) {
-            res.render('error', {
-                status: 500
-            });
-        } else {
-            res.jsonp(article);
-        }
-    });
+	article.remove(function(err) {
+		if (err) {
+			res.render('error', {
+				status: 500
+			});
+		} else {
+			res.jsonp(article);
+		}
+	});
 };
 
 /**
  * List of Articles
  */
 exports.list = function(req, res) {
-    Article.find().sort('-created').populate('user', 'displayName').exec(function(err, articles) {
-        if (err) {
-            res.render('error', {
-                status: 500
-            });
-        } else {
-            res.jsonp(articles);
-        }
-    });
+	Article.find().sort('-created').populate('user', 'displayName').exec(function(err, articles) {
+		if (err) {
+			res.render('error', {
+				status: 500
+			});
+		} else {
+			res.jsonp(articles);
+		}
+	});
 };
 
 /**
  * Article middleware
  */
 exports.articleByID = function(req, res, next, id) {
-    Article.load(id, function(err, article) {
-        if (err) return next(err);
-        if (!article) return next(new Error('Failed to load article ' + id));
-        req.article = article;
-        next();
-    });
+	Article.load(id, function(err, article) {
+		if (err) return next(err);
+		if (!article) return next(new Error('Failed to load article ' + id));
+		req.article = article;
+		next();
+	});
 };
 
 /**
  * Article authorization middleware
  */
 exports.hasAuthorization = function(req, res, next) {
-    if (req.article.user.id !== req.user.id) {
-        return res.send(403, 'User is not authorized');
-    }
-    next();
+	if (req.article.user.id !== req.user.id) {
+		return res.send(403, 'User is not authorized');
+	}
+	next();
 };
diff --git a/app/controllers/core.js b/app/controllers/core.js
@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 exports.index = function(req, res) {
-    res.render('index.html', {
+	res.render('index.html', {
 		user: req.user || null
-    });
-};
+	});
+};
diff --git a/app/models/article.js b/app/models/article.js
@@ -4,48 +4,48 @@
  * Module dependencies.
  */
 var mongoose = require('mongoose'),
-    Schema = mongoose.Schema;
+	Schema = mongoose.Schema;
 
 /**
  * Article Schema
  */
 var ArticleSchema = new Schema({
-    created: {
-        type: Date,
-        default: Date.now
-    },
-    title: {
-        type: String,
-        default: '',
-        trim: true
-    },
-    content: {
-        type: String,
-        default: '',
-        trim: true
-    },
-    user: {
-        type: Schema.ObjectId,
-        ref: 'User'
-    }
+	created: {
+		type: Date,
+		default: Date.now
+	},
+	title: {
+		type: String,
+		default: '',
+		trim: true
+	},
+	content: {
+		type: String,
+		default: '',
+		trim: true
+	},
+	user: {
+		type: Schema.ObjectId,
+		ref: 'User'
+	}
 });
 
 /**
  * Validations
  */
 ArticleSchema.path('title').validate(function(title) {
-    return title.length;
+	return title.length;
 }, 'Title cannot be blank');
 
 /**
  * Statics
  */
 ArticleSchema.statics = {
-    load: function(id, cb) {
-        this.findOne({
-            _id: id
-        }).populate('user', 'displayName').exec(cb);
-    }
+	load: function(id, cb) {
+		this.findOne({
+			_id: id
+		}).populate('user', 'displayName').exec(cb);
+	}
 };
 
 mongoose.model('Article', ArticleSchema);
diff --git a/app/models/user.js b/app/models/user.js
@@ -14,28 +14,28 @@ var UserSchema = new Schema({
 	firstName: {
 		type: String,
 		default: '',
-        trim: true
+		trim: true
 	},
 	lastName: {
 		type: String,
 		default: '',
-        trim: true
+		trim: true
 	},
 	displayName: {
 		type: String,
 		default: '',
-        trim: true
+		trim: true
 	},
 	email: {
 		type: String,
 		default: '',
-        trim: true,
+		trim: true,
 		unique: true
 	},
 	username: {
 		type: String,
 		default: '',
-        trim: true,
+		trim: true,
 		unique: true
 	},
 	provider: {