From eb5be2f6719b9575293e39b6ded5b483a0e5fd2a Mon Sep 17 00:00:00 2001 From: Julian Lam <julian@designcreateplay.com> Date: Tue, 28 Jul 2015 07:49:28 -0400 Subject: [PATCH] fixed some whitespace issues and made the admin check return early, in its own block --- public/src/modules/helpers.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index 59fd69abc6..305d9d02f1 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -115,21 +115,21 @@ // Groups helpers helpers.membershipBtn = function(groupObj) { - if (groupObj.name==='administrators') { - return ''; - } else { - if (groupObj.isMember) { - return '<button class="btn btn-danger" data-action="leave" data-group="' + groupObj.displayName + '"><i class="fa fa-times"></i> Leave Group</button>'; + if (groupObj.name === 'administrators') { + return ''; + } + + if (groupObj.isMember) { + return '<button class="btn btn-danger" data-action="leave" data-group="' + groupObj.displayName + '"><i class="fa fa-times"></i> Leave Group</button>'; + } else { + if (groupObj.isPending) { + return '<button class="btn btn-warning disabled"><i class="fa fa-clock-o"></i> Invitation Pending</button>'; + } else if (groupObj.isInvited) { + return '<button class="btn btn-link" data-action="rejectInvite" data-group="' + groupObj.displayName + '">Reject</button><button class="btn btn-success" data-action="acceptInvite" data-group="' + groupObj.name + '"><i class="fa fa-plus"></i> Accept Invitation</button>'; } else { - if (groupObj.isPending) { - return '<button class="btn btn-warning disabled"><i class="fa fa-clock-o"></i> Invitation Pending</button>'; - } else if (groupObj.isInvited) { - return '<button class="btn btn-link" data-action="rejectInvite" data-group="' + groupObj.displayName + '">Reject</button><button class="btn btn-success" data-action="acceptInvite" data-group="' + groupObj.name + '"><i class="fa fa-plus"></i> Accept Invitation</button>'; - } else { - return '<button class="btn btn-success" data-action="join" data-group="' + groupObj.displayName + '"><i class="fa fa-plus"></i> Join Group</button>'; - } + return '<button class="btn btn-success" data-action="join" data-group="' + groupObj.displayName + '"><i class="fa fa-plus"></i> Join Group</button>'; } - } + } }; helpers.spawnPrivilegeStates = function(member, privileges) {