aboutsummaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/users/groups.js13
1 files changed, 5 insertions, 8 deletions
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 073551c0d8e..522291a00d7 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -227,7 +227,7 @@ GroupList = {
},
isAddGroupButtonVisible: function () {
- return $('#newgroup-init').is(":visible");
+ return !$('#newgroup-entry').hasClass('editing');
},
toggleAddGroup: function (event) {
@@ -235,14 +235,12 @@ GroupList = {
if (event) {
event.stopPropagation();
}
- $('#newgroup-form').show();
- $('#newgroup-init').hide();
- $('#newgroupname').focus();
+ $('#newgroup-entry').addClass('editing');
+ $('#newgroupname').select();
GroupList.handleAddGroupInput('');
}
else {
- $('#newgroup-form').hide();
- $('#newgroup-init').show();
+ $('#newgroup-entry').removeClass('editing');
$('#newgroupname').val('');
}
},
@@ -299,7 +297,7 @@ GroupList = {
}
// Call function for handling delete/undo
- GroupDeleteHandler.mark(GroupList.getElementGID(this));
+ GroupDeleteHandler.mark(GroupList.getElementGID($(this).parent()));
};
$userGroupList.on('click', '.delete', deleteAction);
@@ -340,7 +338,6 @@ $(document).ready( function () {
}
// Display or hide of Create Group List Element
- $('#newgroup-form').hide();
$('#newgroup-init').on('click', function (e) {
GroupList.toggleAddGroup(e);
});