summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2017-11-17 17:08:29 +0100
committerArthur Schiwon <blizzz@arthur-schiwon.de>2017-11-17 17:08:29 +0100
commita1d4ac6d43320d1977e0b7e814d83443db2e177e (patch)
treecb5734a5577032169f71225f13082f0a46cdae55 /core
parent19e4a3373b057a97b57368b578b7ded46895979d (diff)
downloadnextcloud-server-a1d4ac6d43320d1977e0b7e814d83443db2e177e.tar.gz
nextcloud-server-a1d4ac6d43320d1977e0b7e814d83443db2e177e.zip
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>
Diffstat (limited to 'core')
-rw-r--r--core/js/sharedialogshareelistview.js6
1 files changed, 3 insertions, 3 deletions
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'));
}
}