mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12593 from nextcloud/backport/12554/stable14 

[stable14] Do not switch to root folder if filelist is already shown
This commit is contained in:
Morris Jobke 2018-11-23 08:44:02 +01:00 committed by GitHub
parent d655567672 07c5c686a0
commit e1873e8928
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/files/js/filelist.js
View File

@ -593,8 +593,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;
},

7
apps/files/js/navigation.js
View File

@ -119,7 +119,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,