diff options
| -rw-r--r-- | apps/files/js/app.js | 4 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 4 | ||||
| -rw-r--r-- | core/js/apps.js | 12 |
3 files changed, 14 insertions, 6 deletions
diff --git a/apps/files/js/app.js b/apps/files/js/app.js index adb1893bb0e..f31770466fe 100644 --- a/apps/files/js/app.js +++ b/apps/files/js/app.js @@ -162,6 +162,7 @@ dir: '/' }; this._changeUrl(params.view, params.dir); + OC.Apps.hideAppSidebar($('.detailsView')); this.navigation.getActiveContainer().trigger(new $.Event('urlChanged', params)); } }, @@ -181,6 +182,9 @@ */ _onChangeViewerMode: function(e) { var state = !!e.viewerModeEnabled; + if (e.viewerModeEnabled) { + OC.Apps.hideAppSidebar($('.detailsView')); + } $('#app-navigation').toggleClass('hidden', state); $('.app-files').toggleClass('viewer-mode no-sidebar', state); }, diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index e294e2f3c09..ac96d587015 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -339,7 +339,7 @@ } if (!fileName) { - OC.Apps.hideAppSidebar(); + OC.Apps.hideAppSidebar(this._detailsView.$el); this._detailsView.setFileInfo(null); this._currentFileModel = null; return; @@ -354,7 +354,7 @@ this._detailsView.setFileInfo(model); this._detailsView.$el.scrollTop(0); - _.defer(OC.Apps.showAppSidebar); + _.defer(OC.Apps.showAppSidebar, this._detailsView.$el); }, /** diff --git a/core/js/apps.js b/core/js/apps.js index d0d351f5147..f148de3b2e9 100644 --- a/core/js/apps.js +++ b/core/js/apps.js @@ -22,9 +22,11 @@ /** * Shows the #app-sidebar and add .with-app-sidebar to subsequent siblings + * + * @param {Object} [$el] sidebar element to show, defaults to $('#app-sidebar') */ - exports.Apps.showAppSidebar = function() { - var $appSidebar = $('#app-sidebar'); + exports.Apps.showAppSidebar = function($el) { + var $appSidebar = $el || $('#app-sidebar'); $appSidebar.removeClass('disappear') $('#app-content').addClass('with-app-sidebar'); @@ -33,9 +35,11 @@ /** * Shows the #app-sidebar and removes .with-app-sidebar from subsequent * siblings + * + * @param {Object} [$el] sidebar element to hide, defaults to $('#app-sidebar') */ - exports.Apps.hideAppSidebar = function() { - var $appSidebar = $('#app-sidebar'); + exports.Apps.hideAppSidebar = function($el) { + var $appSidebar = $el || $('#app-sidebar'); $appSidebar.addClass('disappear'); $('#app-content').removeClass('with-app-sidebar'); }; |