From 93838893144c79aacd0f5e929125ef4dc6e9a1e3 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 17 Nov 2017 17:08:29 +0100 Subject: only replace permission popupmenu the contacts popovermenu is also present and is being replaces, ending up in two permission popupmenus with checkboxes duplicating the id, breaking further permission changes. plus, fixing a selector Signed-off-by: Arthur Schiwon --- core/js/sharedialogshareelistview.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core') diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js index d3802824fe0..b4828e3b0dc 100644 --- a/core/js/sharedialogshareelistview.js +++ b/core/js/sharedialogshareelistview.js @@ -376,7 +376,7 @@ var sharee = this.getShareeObject(shareWithIndex); $.extend(sharee, this.getShareProperties()); var $li = this.$('li[data-share-id=' + permissionChangeShareId + ']'); - $li.find('.popovermenu').replaceWith(this.popoverMenuTemplate(sharee)); + $li.find('.sharingOptionsGroup .popovermenu').replaceWith(this.popoverMenuTemplate(sharee)); var checkBoxId = 'canEdit-' + this.cid + '-' + sharee.shareWith; checkBoxId = '#' + checkBoxId.replace( /(:|\.|\[|\]|,|=|@)/g, "\\$1"); @@ -403,12 +403,12 @@ } } }); - if (this._menuOpen != false) { + if (this._menuOpen !== false) { // Open menu again if it was opened before var shareId = parseInt(this._menuOpen, 10); if(!_.isNaN(shareId)) { var liSelector = 'li[data-share-id=' + shareId + ']'; - OC.showMenu(null, this.$(liSelector + '.sharingOptionsGroup .popovermenu')); + OC.showMenu(null, this.$(liSelector + ' .sharingOptionsGroup .popovermenu')); } } -- cgit v1.2.3