From 05f33df098251cc0ed5144d13c18136b553fc013 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 12 Nov 2014 16:56:11 -0500 Subject: [PATCH] manage/groups.js --- public/src/admin/manage/groups.js | 34 +++++++++---------------------- 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/public/src/admin/manage/groups.js b/public/src/admin/manage/groups.js index 6871bc07b1..6878c81711 100644 --- a/public/src/admin/manage/groups.js +++ b/public/src/admin/manage/groups.js @@ -8,24 +8,18 @@ define('admin/manage/groups', ['admin/modules/iconSelect'], function(iconSelect) var yourid = ajaxify.variables.get('yourid'), createModal = $('#create-modal'), createGroupName = $('#create-group-name'), - create = $('#create'), createModalGo = $('#create-modal-go'), - createGroupDesc = $('#create-group-desc'), createModalError = $('#create-modal-error'), groupDetailsModal = $('#group-details-modal'), groupDetailsSearch = $('#group-details-search'), groupDetailsSearchResults = $('#group-details-search-results'), groupMembersEl = $('ul.current_members'), - formEl = groupDetailsModal.find('form'), detailsModalSave = $('#details-modal-save'), - groupsList = $('#groups-list'), groupIcon = $('#group-icon'), - changeGroupIcon = $('#change-group-icon'), changeGroupName = $('#change-group-name'), changeGroupDesc = $('#change-group-desc'), changeGroupUserTitle = $('#change-group-user-title'), changeGroupLabelColor = $('#change-group-label-color'), - groupIcon = $('#group-icon'), groupLabelPreview = $('#group-label-preview'), searchDelay; @@ -33,16 +27,12 @@ define('admin/manage/groups', ['admin/modules/iconSelect'], function(iconSelect) $('#groups-list .members li').tooltip(); createModal.on('keypress', function(e) { - switch(e.keyCode) { - case 13: - createModalGo.click(); - break; - default: - break; + if (e.keyCode === 13) { + createModalGo.click(); } }); - create.on('click', function() { + $('#create').on('click', function() { createModal.modal('show'); setTimeout(function() { createGroupName.focus(); @@ -52,7 +42,7 @@ define('admin/manage/groups', ['admin/modules/iconSelect'], function(iconSelect) createModalGo.on('click', function() { var submitObj = { name: createGroupName.val(), - description: createGroupDesc.val() + description: $('#create-group-desc').val() }, errorText; @@ -82,13 +72,9 @@ define('admin/manage/groups', ['admin/modules/iconSelect'], function(iconSelect) }); }); - formEl.keypress(function(e) { - switch(e.keyCode) { - case 13: - detailsModalSave.click(); - break; - default: - break; + groupDetailsModal.find('form').keypress(function(e) { + if (e.keyCode === 13) { + detailsModalSave.click(); } }); @@ -101,10 +87,10 @@ define('admin/manage/groups', ['admin/modules/iconSelect'], function(iconSelect) changeGroupLabelColor.keydown(function() { setTimeout(function() { groupLabelPreview.css('background', changeGroupLabelColor.val() || '#000000'); - }, 0); + }, 0); }); - groupsList.on('click', 'button[data-action]', function() { + $('#groups-list').on('click', 'button[data-action]', function() { var el = $(this), action = el.attr('data-action'), groupName = el.parents('li[data-groupname]').attr('data-groupname'); @@ -229,7 +215,7 @@ define('admin/manage/groups', ['admin/modules/iconSelect'], function(iconSelect) }); }); - changeGroupIcon.on('click', function() { + $('#change-group-icon').on('click', function() { iconSelect.init(groupIcon); });