summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-11-02 11:27:49 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-11-02 11:27:49 +0100
commitc5caebbd1f9d964b64bc3da79113b02770322e8a (patch)
tree46e86956a1d3024c7c261e6b2e598b9d1db2b4ea /apps
parentbe5552981a600f7a87915e8573330906dbd7bebd (diff)
parenta378dc5a7b21514242647a62f60bada4106acc4f (diff)
downloadnextcloud-server-c5caebbd1f9d964b64bc3da79113b02770322e8a.tar.gz
nextcloud-server-c5caebbd1f9d964b64bc3da79113b02770322e8a.zip
Merge pull request #20219 from owncloud/issue-19707-scrollto-in-trashibn
Fix scrollto= parameter in trashbin view
Diffstat (limited to 'apps')
-rw-r--r--apps/files_trashbin/js/app.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js
index 364b51697bd..1f46f568bf2 100644
--- a/apps/files_trashbin/js/app.js
+++ b/apps/files_trashbin/js/app.js
@@ -23,11 +23,13 @@ OCA.Trashbin.App = {
return;
}
this._initialized = true;
+ var urlParams = OC.Util.History.parseUrlQuery();
this.fileList = new OCA.Trashbin.FileList(
$('#app-content-trashbin'), {
scrollContainer: $('#app-content'),
fileActions: this._createFileActions(),
- detailsViewEnabled: false
+ detailsViewEnabled: false,
+ scrollTo: urlParams.scrollto
}
);
},