From b6192db61076b04005388b889d6ec666f3e87687 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Thu, 16 Jul 2015 12:28:19 +0200 Subject: [PATCH] Disable right sidebar in public file list page --- apps/files/js/filelist.js | 17 ++++++++++++----- apps/files_sharing/js/public.js | 3 ++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 796b14199d..e228b8e852 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -23,6 +23,7 @@ * @param [options.scrollContainer] scrollable container, defaults to $(window) * @param [options.dragOptions] drag options, disabled by default * @param [options.folderDropOptions] folder drop options, disabled by default + * @param [options.detailsViewEnabled=true] whether to enable details view */ var FileList = function($el, options) { this.initialize($el, options); @@ -210,10 +211,12 @@ } this.breadcrumb = new OCA.Files.BreadCrumb(breadcrumbOptions); - this._detailsView = new OCA.Files.DetailsView(); - this._detailsView.addDetailView(new OCA.Files.MainFileInfoDetailView()); - this.$el.append(this._detailsView.$el); - this._detailsView.$el.addClass('disappear'); + if (_.isUndefined(options.detailsViewEnabled) || options.detailsViewEnabled) { + this._detailsView = new OCA.Files.DetailsView(); + this._detailsView.addDetailView(new OCA.Files.MainFileInfoDetailView()); + this.$el.append(this._detailsView.$el); + this._detailsView.$el.addClass('disappear'); + } this.$el.find('#controls').prepend(this.breadcrumb.$el); @@ -285,6 +288,10 @@ * @param {OCA.Files.FileInfo} fileInfo file info to display */ _updateDetailsView: function(fileInfo) { + if (!this._detailsView) { + return; + } + var self = this; var oldFileInfo = this._detailsView.getFileInfo(); if (oldFileInfo) { @@ -403,7 +410,7 @@ this.updateSelectionSummary(); } else { // clicked directly on the name - if ($(event.target).is('.nametext') || $(event.target).closest('.nametext').length) { + if (!this._detailsView || $(event.target).is('.nametext') || $(event.target).closest('.nametext').length) { var filename = $tr.attr('data-file'); var renaming = $tr.data('renaming'); if (!renaming) { diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 5923e426f0..1993efe7d7 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -57,7 +57,8 @@ OCA.Sharing.PublicApp = { scrollContainer: $(window), dragOptions: dragOptions, folderDropOptions: folderDropOptions, - fileActions: fileActions + fileActions: fileActions, + detailsViewEnabled: false } ); this.files = OCA.Files.Files;