aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-09-22 23:53:15 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-09-22 23:53:15 +0200
commit9fbd3fa6c14a59dc829a47cd334b9038777105b4 (patch)
tree81d1bca227e6bbe6c1e519cab3e437fd8a6f2afb /apps
parent3bce50f64b856f33396d8681d11cff493c123b75 (diff)
parentfa725fba7362734d6f9fdd5acb6b5fe4f1aff0ca (diff)
downloadnextcloud-server-9fbd3fa6c14a59dc829a47cd334b9038777105b4.tar.gz
nextcloud-server-9fbd3fa6c14a59dc829a47cd334b9038777105b4.zip
Merge pull request #19270 from owncloud/files-sidebar-fixfortrashandco
Properly show sidebar for trash and sharing sections
Diffstat (limited to 'apps')
-rw-r--r--apps/files/js/detailsview.js2
-rw-r--r--apps/files/js/filelist.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/files/js/detailsview.js b/apps/files/js/detailsview.js
index 3a775c29ec6..b01f9cea610 100644
--- a/apps/files/js/detailsview.js
+++ b/apps/files/js/detailsview.js
@@ -84,7 +84,7 @@
},
_onClose: function(event) {
- OC.Apps.hideAppSidebar();
+ OC.Apps.hideAppSidebar(this.$el);
event.preventDefault();
},
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index ece330d41cc..28bac23ecb0 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -306,7 +306,7 @@
permissions: OC.PERMISSION_READ,
actionHandler: function(fileName, context) {
self._updateDetailsView(fileName);
- OC.Apps.showAppSidebar();
+ OC.Apps.showAppSidebar(self._detailsView.$el);
}
});
}
@@ -381,7 +381,7 @@
if (tabId) {
this._detailsView.selectTab(tabId);
}
- OC.Apps.showAppSidebar();
+ OC.Apps.showAppSidebar(this._detailsView.$el);
},
/**