Skip to content
Snippets Groups Projects
Commit 853ced64 authored by Arthur Schiwon's avatar Arthur Schiwon
Browse files

hide Add Group when clicking away or pressing ESC

parent a4cfa955
Branches
No related tags found
No related merge requests found
...@@ -74,6 +74,11 @@ ...@@ -74,6 +74,11 @@
OC.Notification.showHtml(t('settings', 'deleted') + ' ' + escapeHTML(gid) + '<span class="undo">' + t('settings', 'undo') + '</span>'); OC.Notification.showHtml(t('settings', 'deleted') + ' ' + escapeHTML(gid) + '<span class="undo">' + t('settings', 'undo') + '</span>');
}, },
elementBelongsToAddGroup: function(el) {
return !(el !== $('#newgroup-form').get(0)
&& $('#newgroup-form').find($(el)).length === 0);
},
showGroup: function (gid) { showGroup: function (gid) {
UserList.empty(); UserList.empty();
UserList.update(gid); UserList.update(gid);
...@@ -84,8 +89,12 @@ ...@@ -84,8 +89,12 @@
} }
}, },
isAddGroupButtonVisible: function() {
return $('#newgroup-init').is(":visible");
},
toggleAddGroup: function(event) { toggleAddGroup: function(event) {
if($('#newgroup-init').is(":visible")) { if(GroupList.isAddGroupButtonVisible()) {
event.stopPropagation(); event.stopPropagation();
$('#newgroup-form').show(); $('#newgroup-form').show();
$('#newgroup-init').hide(); $('#newgroup-init').hide();
...@@ -149,6 +158,18 @@ $(document).ready( function () { ...@@ -149,6 +158,18 @@ $(document).ready( function () {
GroupList.toggleAddGroup(e); GroupList.toggleAddGroup(e);
}); });
$(document).on('click keydown keyup', function(event) {
if(!GroupList.isAddGroupButtonVisible()
&& !GroupList.elementBelongsToAddGroup(event.target)) {
GroupList.toggleAddGroup();
}
// Escape
if(!GroupList.isAddGroupButtonVisible() && event.keyCode && event.keyCode === 27) {
GroupList.toggleAddGroup();
}
});
// Responsible for Creating Groups. // Responsible for Creating Groups.
$('#newgroup-form form').submit(function (event) { $('#newgroup-form form').submit(function (event) {
event.preventDefault(); event.preventDefault();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment