mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7259 from nextcloud/7211-stable12 

[stable12] only replace permission popupmenu
This commit is contained in:
Morris Jobke 2017-11-23 13:00:37 +01:00 committed by GitHub
parent fd46475f6e 9383889314
commit 4a4cf2613c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/js/sharedialogshareelistview.js
View File

@ -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'));
}
}