summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-09-28 16:03:24 +0200
committerGitHub <noreply@github.com>2018-09-28 16:03:24 +0200
commitd867f9f091933ebc134cc50ba1ed835dbd39d36d (patch)
treeed0d4f75fb529d0bf323dcee9937989f6e7bfe58 /core
parenta23d5240987392f4eb140eefbb81882ef6ae6a5a (diff)
parentc5f77de3e270f3e6ad25e662ab77e1d68eaee67b (diff)
downloadnextcloud-server-d867f9f091933ebc134cc50ba1ed835dbd39d36d.tar.gz
nextcloud-server-d867f9f091933ebc134cc50ba1ed835dbd39d36d.zip
Merge pull request #11037 from nextcloud/trash-webui-dav
Use trashbin dav endpoint to list trash in webui
Diffstat (limited to 'core')
-rw-r--r--core/js/files/client.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/js/files/client.js b/core/js/files/client.js
index 9d3f5c4a3d6..aa450df1773 100644
--- a/core/js/files/client.js
+++ b/core/js/files/client.js
@@ -61,6 +61,7 @@
}
this._client = new dav.Client(clientOptions);
this._client.xhrProvider = _.bind(this._xhrProvider, this);
+ this._fileInfoParsers = [];
};
Client.NS_OWNCLOUD = 'http://owncloud.org/ns';
@@ -390,7 +391,7 @@
// extend the parsed data using the custom parsers
_.each(this._fileInfoParsers, function(parserFunction) {
- _.extend(data, parserFunction(response) || {});
+ _.extend(data, parserFunction(response, data) || {});
});
return new FileInfo(data);