diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-11-22 16:09:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-22 16:09:56 +0100 |
| commit | 2e52ea5ad47386bd135beddd6e425d82466ebe1c (patch) | |
| tree | 3ae9dc88a15dfb76bf18c80d3beff3f776586df5 | |
| parent | e0967ffd3a64d85434d20e90b999e231d5847fb4 (diff) | |
| parent | a90b4bcc324790a24d2fa9de04ac6ecd90e99cf4 (diff) | |
| download | nextcloud-server-2e52ea5ad47386bd135beddd6e425d82466ebe1c.tar.gz nextcloud-server-2e52ea5ad47386bd135beddd6e425d82466ebe1c.zip | |
Merge pull request #12554 from nextcloud/bugfix/12493/root-folder-switch
Do not switch to root folder if filelist is already shown
| -rw-r--r-- | apps/files/js/filelist.js | 9 | ||||
| -rw-r--r-- | apps/files/js/navigation.js | 7 |
2 files changed, 13 insertions, 3 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 047837cd9d7..7a8a8b80e10 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -653,8 +653,13 @@ */ _onShow: function(e) { if (this.shown) { - this._setCurrentDir('/', false); - this.reload(); + if (e.itemId === this.id) { + this._setCurrentDir('/', false); + } + // Only reload if we don't navigate to a different directory + if (typeof e.dir === 'undefined' || e.dir === this.getCurrentDirectory()) { + this.reload(); + } } this.shown = true; }, diff --git a/apps/files/js/navigation.js b/apps/files/js/navigation.js index b3648fedc6c..02a0af2b369 100644 --- a/apps/files/js/navigation.js +++ b/apps/files/js/navigation.js @@ -154,7 +154,12 @@ this.$currentContent = $('#app-content-' + (typeof itemView === 'string' && itemView !== '' ? itemView : itemId)); this.$currentContent.removeClass('hidden'); if (!options || !options.silent) { - this.$currentContent.trigger(jQuery.Event('show')); + this.$currentContent.trigger(jQuery.Event('show', { + itemId: itemId, + previousItemId: oldItemId, + dir: itemDir, + view: itemView + })); this.$el.trigger( new $.Event('itemChanged', { itemId: itemId, |