aboutsummaryrefslogtreecommitdiffstats
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-23 12:08:29 +0100
commit93838893144c79aacd0f5e929125ef4dc6e9a1e3 (patch)
treeab89fa49f189eee02085856090c545b22d46b4a1 /core
parentfd46475f6efa445d906a07b9f1f47f188623be5b (diff)
downloadnextcloud-server-93838893144c79aacd0f5e929125ef4dc6e9a1e3.tar.gz
nextcloud-server-93838893144c79aacd0f5e929125ef4dc6e9a1e3.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'));
}
}