diff options
| author | blizzz <blizzz@owncloud.com> | 2015-11-02 13:32:24 +0100 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2015-11-02 13:32:24 +0100 |
| commit | 83d3c94590aa877fe23a5d49c991e617d76a6060 (patch) | |
| tree | 88813a6c5e13381bf8a23723862a6b7d7ea56a92 /apps/files_trashbin/js/app.js | |
| parent | 16aa33947581959eeb9a89530ad0152cb2c33c25 (diff) | |
| parent | a8641fdc9559d67696fb612597c4b27d1832220a (diff) | |
| download | nextcloud-server-83d3c94590aa877fe23a5d49c991e617d76a6060.tar.gz nextcloud-server-83d3c94590aa877fe23a5d49c991e617d76a6060.zip | |
Merge branch 'master' into fix-20151
Diffstat (limited to 'apps/files_trashbin/js/app.js')
| -rw-r--r-- | apps/files_trashbin/js/app.js | 4 |
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 } ); }, |