summaryrefslogtreecommitdiffstats
path: root/core/js/files
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-11-18 15:18:00 +0100
committerLukas Reschke <lukas@owncloud.com>2015-11-22 16:05:51 +0100
commita1d0682ef849a452c0be4d107104e476007a6aa1 (patch)
tree71139ed577ea2ae84008c833b7921ff3c95d1f14 /core/js/files
parentab1d786d879d519c86cd2016490d1ade5e43fd41 (diff)
downloadnextcloud-server-a1d0682ef849a452c0be4d107104e476007a6aa1.tar.gz
nextcloud-server-a1d0682ef849a452c0be4d107104e476007a6aa1.zip
Use oc:fileid property instead of oc:id
Diffstat (limited to 'core/js/files')
-rw-r--r--core/js/files/client.js20
1 files changed, 3 insertions, 17 deletions
diff --git a/core/js/files/client.js b/core/js/files/client.js
index 07a7132d4be..82cf3ff5121 100644
--- a/core/js/files/client.js
+++ b/core/js/files/client.js
@@ -79,9 +79,9 @@
*/
[Client.NS_DAV, 'resourcetype'],
/**
- * Compound file id, contains fileid + server instance id
+ * File id
*/
- [Client.NS_OWNCLOUD, 'id'],
+ [Client.NS_OWNCLOUD, 'fileid'],
/**
* Letter-coded permissions
*/
@@ -211,20 +211,6 @@
},
/**
- * Parses the compound file id
- *
- * @param {string} compoundFileId compound file id as returned by the server
- *
- * @return {int} local file id, stripped of the instance id
- */
- _parseFileId: function(compoundFileId) {
- if (!compoundFileId || compoundFileId.length < 8) {
- return null;
- }
- return parseInt(compoundFileId.substr(0, 8), 10);
- },
-
- /**
* Parses the etag response which is in double quotes.
*
* @param {string} etag etag value in double quotes
@@ -264,7 +250,7 @@
var props = response.propStat[0].properties;
var data = {
- id: this._parseFileId(props['{' + Client.NS_OWNCLOUD + '}id']),
+ id: props['{' + Client.NS_OWNCLOUD + '}fileid'],
path: OC.dirname(path) || '/',
name: OC.basename(path),
mtime: new Date(props['{' + Client.NS_DAV + '}getlastmodified'])