summaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2023-11-21 12:42:57 +0100
committerJulius Härtl <jus@bitgrid.net>2023-11-24 09:41:14 +0100
commit26b982daf3798c5c45e74b80e066075713379cef (patch)
tree41fc8fec374318b4b6c629556829032eeaafea6a /apps/files/js
parent0af2125a82f23ad337ca2ad12ac034ca72409e96 (diff)
downloadnextcloud-server-26b982daf3798c5c45e74b80e066075713379cef.tar.gz
nextcloud-server-26b982daf3798c5c45e74b80e066075713379cef.zip
fix: Avoid triggering a defered sidebar open if openFile is already handling that
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/filelist.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 95b650417ec..1924cd9538e 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -410,7 +410,7 @@
if (options.scrollTo) {
this.$fileList.one('updated', function() {
- self.scrollTo(options.scrollTo);
+ self.scrollTo(options.scrollTo, !options.openFile);
});
}
@@ -3351,11 +3351,14 @@
this.$el.find('.mask').remove();
this.$table.removeClass('hidden');
},
- scrollTo:function(file) {
+ scrollTo:function(file, showDetails) {
+ if (showDetails === undefined) {
+ showDetails = true
+ }
if (!_.isArray(file)) {
file = [file];
}
- if (file.length === 1) {
+ if (file.length === 1 && showDetails) {
_.defer(function() {
if (document.documentElement.clientWidth > 1024) {
this.showDetailsView(file[0]);