aboutsummaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-11-28 12:54:51 +0100
committerGitHub <noreply@github.com>2016-11-28 12:54:51 +0100
commitd02296d42f0d1ce95a9fca5491bd4f9e537dc67e (patch)
treee8b8eee943aba4938a4fb96a46c8b05e2467918b /core/js
parentddea6d1a90acc0d5c1d24dbe6b770cae6ab4d3a1 (diff)
parent1965617a2fd98b849ebb5deaad0ad0caf6f58c0a (diff)
downloadnextcloud-server-d02296d42f0d1ce95a9fca5491bd4f9e537dc67e.tar.gz
nextcloud-server-d02296d42f0d1ce95a9fca5491bd4f9e537dc67e.zip
Merge pull request #2363 from nextcloud/fix-2329
open popup menu in share dialog only for one sharee on render
Diffstat (limited to 'core/js')
-rw-r--r--core/js/sharedialogshareelistview.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 89368955a38..226f18b2d76 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -282,9 +282,13 @@
this.$('.popovermenu').on('afterHide', function() {
_this._menuOpen = false;
});
- if (this._menuOpen) {
+ if (this._menuOpen != false) {
// Open menu again if it was opened before
- OC.showMenu(null, this.$('.popovermenu'));
+ var shareId = parseInt(this._menuOpen, 10);
+ if(!_.isNaN(shareId)) {
+ var liSelector = 'li[data-share-id=' + shareId + ']';
+ OC.showMenu(null, this.$(liSelector + ' .popovermenu'));
+ }
}
this.delegateEvents();
@@ -342,7 +346,7 @@
var $menu = $li.find('.popovermenu');
OC.showMenu(null, $menu);
- this._menuOpen = true;
+ this._menuOpen = $li.data('share-id');
},
onPermissionChange: function(event) {