diff --git a/js/app.js b/js/app.js index 3b428381..1fd623d8 100644 --- a/js/app.js +++ b/js/app.js @@ -252,12 +252,10 @@ OC.Contacts = OC.Contacts || { if(act && act.length > 0) { this.$contactList.addClass('multiselect'); this.$contactListHeader.find('.actions').css('display', ''); - this.$contactListHeader.find('.action').css('display', ''); + this.$contactListHeader.find('.action').css('display', 'none'); this.$contactListHeader.find('.name').attr('colspan', '5'); this.$contactListHeader.find('.info').css('display', 'none'); - if($.inArray('merge', act) !== -1) this.$contactListHeader.find('.merge').css('display', ''); - else this.$contactListHeader.find('.merge').css('display', 'none'); - this.$headeractions.children('.'+act.join(',.')).show(); + this.$contactListHeader.find('.'+act.join(',.')).css('display', ''); } else { this.$contactListHeader.find('.actions').css('display', 'none'); this.$contactListHeader.find('.name').attr('colspan', '1'); @@ -266,7 +264,7 @@ OC.Contacts = OC.Contacts || { } }, showAction:function(act, show) { - this.$headeractions.find('.' + act).toggle(show); + this.$contactListHeader.find('.' + act).toggle(show); }, cacheElements: function() { var self = this;