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 <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2017-11-17 17:08:29 +01:00
parent 19e4a3373b
commit a1d4ac6d43
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
1 changed files with 3 additions and 3 deletions

View File

@ -376,7 +376,7 @@
var sharee = this.getShareeObject(shareWithIndex); var sharee = this.getShareeObject(shareWithIndex);
$.extend(sharee, this.getShareProperties()); $.extend(sharee, this.getShareProperties());
var $li = this.$('li[data-share-id=' + permissionChangeShareId + ']'); 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; var checkBoxId = 'canEdit-' + this.cid + '-' + sharee.shareWith;
checkBoxId = '#' + checkBoxId.replace( /(:|\.|\[|\]|,|=|@)/g, "\\$1"); 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 // Open menu again if it was opened before
var shareId = parseInt(this._menuOpen, 10); var shareId = parseInt(this._menuOpen, 10);
if(!_.isNaN(shareId)) { if(!_.isNaN(shareId)) {
var liSelector = 'li[data-share-id=' + shareId + ']'; var liSelector = 'li[data-share-id=' + shareId + ']';
OC.showMenu(null, this.$(liSelector + '.sharingOptionsGroup .popovermenu')); OC.showMenu(null, this.$(liSelector + ' .sharingOptionsGroup .popovermenu'));
} }
} }