From 78e1e4fbacddfa63a77091afb6061f0485b0562c Mon Sep 17 00:00:00 2001
From: Micheil Smith <micheil@brandedcode.com>
Date: Thu, 10 Apr 2014 22:31:55 +0100
Subject: [PATCH] Composer: simplify code with early returns

---
 public/src/modules/composer.js | 103 ++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 46 deletions(-)

diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index b88b4fe469..560c751e7a 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -415,65 +415,76 @@ define(['taskbar'], function(taskbar) {
 	}
 
 	composer.newTopic = function(cid) {
-		if(allowed()) {
-			push({
-				cid: cid,
-				title: '',
-				body: '',
-				modified: false,
-				isMain: true
-			});
+		if(!allowed()) {
+			return;
 		}
+
+		push({
+			cid: cid,
+			title: '',
+			body: '',
+			modified: false,
+			isMain: true
+		});
 	};
 
 	composer.addQuote = function(tid, pid, title, username, text){
-		if (allowed()) {
-			var uuid = composer.active;
-			if(uuid !== undefined){
-				var bodyEl = $('#cmp-uuid-'+uuid).find('textarea');
-				var prevText = bodyEl.val();
-				if(tid !== composer.posts[uuid].tid) {
-					text = username + ' said in ['+title+'](/topic/'+tid+'#'+pid+'):\n'+text;
-				} else {
-					text = username + ' said:\n' + text;
-				}
-				composer.posts[uuid].body = (prevText.length ? prevText + '\n\n' : '') + text;
-				bodyEl.val(composer.posts[uuid].body);
-			} else {
-				composer.newReply(tid, pid, title, username + ' said:\n' + text);
-			}
+		if (!allowed()) {
+			return;
+		}
+
+		var uuid = composer.active;
+
+		if(uuid === undefined){
+			composer.newReply(tid, pid, title, username + ' said:\n' + text);
+			return;
+		}
+
+		var bodyEl = $('#cmp-uuid-'+uuid).find('textarea');
+		var prevText = bodyEl.val();
+		if(tid !== composer.posts[uuid].tid) {
+			text = username + ' said in ['+title+'](/topic/'+tid+'#'+pid+'):\n'+text;
+		} else {
+			text = username + ' said:\n' + text;
 		}
+		composer.posts[uuid].body = (prevText.length ? prevText + '\n\n' : '') + text;
+		bodyEl.val(composer.posts[uuid].body);
 	};
 
 	composer.newReply = function(tid, pid, title, text) {
-		if(allowed()) {
-			push({
-				tid: tid,
-				toPid: pid,
-				title: title,
-				body: text,
-				modified: false,
-				isMain: false
-			});
+		if(!allowed()) {
+			return;
 		}
+
+		push({
+			tid: tid,
+			toPid: pid,
+			title: title,
+			body: text,
+			modified: false,
+			isMain: false
+		});
 	};
 
 	composer.editPost = function(pid) {
-		if(allowed()) {
-			socket.emit('modules.composer.push', pid, function(err, threadData) {
-				if(err) {
-					return app.alertError(err.message);
-				}
-				push({
-					pid: pid,
-					title: threadData.title,
-					body: threadData.body,
-					modified: false,
-					isMain: !threadData.index,
-					topic_thumb: threadData.topic_thumb
-				});
-			});
+		if(!allowed()) {
+			return;
 		}
+
+		socket.emit('modules.composer.push', pid, function(err, threadData) {
+			if(err) {
+				return app.alertError(err.message);
+			}
+
+			push({
+				pid: pid,
+				title: threadData.title,
+				body: threadData.body,
+				modified: false,
+				isMain: !threadData.index,
+				topic_thumb: threadData.topic_thumb
+			});
+		});
 	};
 
 	composer.load = function(post_uuid) {