diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-08-25 11:07:47 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-08-25 11:07:47 +0200 |
| commit | a86602a1575d829a64588b35eb073484ec9543db (patch) | |
| tree | e74c4bfeda9009e244f9c11a6d97d7df0197098d /apps | |
| parent | 2f86be9ced33574a76e821efa45f1ab3939b61e6 (diff) | |
| download | nextcloud-server-a86602a1575d829a64588b35eb073484ec9543db.tar.gz nextcloud-server-a86602a1575d829a64588b35eb073484ec9543db.zip | |
Properly hide sidebar when switching between files app sections
Since there are multiple sidebars, one for each files app section, we
need to hide the correct ones.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/app.js | 4 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 4 |
2 files changed, 6 insertions, 2 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); }, /** |