From b6e56699498d645a002abf322b9df3632369a56c Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 5 Feb 2019 15:10:32 +0100 Subject: [PATCH] Revert "[stable15] Show original path in trashbin" --- apps/files_trashbin/js/filelist.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js index 07e041faefd05..3159506fae962 100644 --- a/apps/files_trashbin/js/filelist.js +++ b/apps/files_trashbin/js/filelist.js @@ -11,7 +11,6 @@ var DELETED_REGEXP = new RegExp(/^(.+)\.d[0-9]+$/); var FILENAME_PROP = '{http://nextcloud.org/ns}trashbin-filename'; var DELETION_TIME_PROP = '{http://nextcloud.org/ns}trashbin-deletion-time'; - var TRASHBIN_ORIGINAL_LOCATION = '{http://nextcloud.org/ns}trashbin-original-location'; /** * Convert a file name in the format filename.d12345 to the real file name. @@ -55,13 +54,11 @@ initialize: function() { this.client.addFileInfoParser(function(response, data) { var props = response.propStat[0].properties; - var path = props[TRASHBIN_ORIGINAL_LOCATION]; return { displayName: props[FILENAME_PROP], mtime: parseInt(props[DELETION_TIME_PROP], 10) * 1000, hasPreview: true, - path: path, - extraData: path + path: data.path.substr(6), // remove leading /trash } }); @@ -251,7 +248,7 @@ * Returns list of webdav properties to request */ _getWebdavProperties: function() { - return [FILENAME_PROP, DELETION_TIME_PROP, TRASHBIN_ORIGINAL_LOCATION].concat(this.filesClient.getPropfindProperties()); + return [FILENAME_PROP, DELETION_TIME_PROP].concat(this.filesClient.getPropfindProperties()); }, /**