diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2022-01-12 14:41:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-12 14:41:50 +0100 |
| commit | db9fbc93072049b8816a683ca015ba53976db03a (patch) | |
| tree | 0dbbe4f6a612ee661f853ecc6f7d3ca14dddba83 /apps/files/js/app.js | |
| parent | 0d0fcd316a6b556cabf656cd7bdca63da26aab2d (diff) | |
| parent | 809e3054448d952124811877c1a944f0446c79c1 (diff) | |
| download | nextcloud-server-db9fbc93072049b8816a683ca015ba53976db03a.tar.gz nextcloud-server-db9fbc93072049b8816a683ca015ba53976db03a.zip | |
Merge pull request #30593 from nextcloud/bugfix/19048/fix-changedirectory-recommendations
Trigger "changeDirectory" event on URL change
Diffstat (limited to 'apps/files/js/app.js')
| -rw-r--r-- | apps/files/js/app.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/files/js/app.js b/apps/files/js/app.js index 5efa20887e6..d6b7a79b362 100644 --- a/apps/files/js/app.js +++ b/apps/files/js/app.js @@ -316,7 +316,7 @@ * Event handler for when an app notified that its directory changed */ _onDirectoryChanged: function(e) { - if (e.dir) { + if (e.dir && !e.changedThroughUrl) { this._changeUrl(this.navigation.getActiveItem(), e.dir, e.fileId); } }, @@ -386,9 +386,11 @@ params.fileid = fileId; } var currentParams = OC.Util.History.parseUrlQuery(); - if (currentParams.dir === params.dir && currentParams.view === params.view && currentParams.fileid !== params.fileid) { - // if only fileid changed or was added, replace instead of push - OC.Util.History.replaceState(this._makeUrlParams(params)); + if (currentParams.dir === params.dir && currentParams.view === params.view) { + if (currentParams.fileid !== params.fileid) { + // if only fileid changed or was added, replace instead of push + OC.Util.History.replaceState(this._makeUrlParams(params)); + } } else { OC.Util.History.pushState(this._makeUrlParams(params)); } |