mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix files UI mtime parsing from webdav

This commit is contained in:
Vincent Petry 2015-12-16 17:44:16 +01:00
parent 9a4ab698b7
commit 181ba7b4e1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/js/files/client.js
View File

@ -253,7 +253,7 @@
id: props['{' + Client.NS_OWNCLOUD + '}fileid'], id: props['{' + Client.NS_OWNCLOUD + '}fileid'],
path: OC.dirname(path) || '/', path: OC.dirname(path) || '/',
name: OC.basename(path), name: OC.basename(path),
mtime: new Date(props['{' + Client.NS_DAV + '}getlastmodified']) mtime: (new Date(props['{' + Client.NS_DAV + '}getlastmodified'])).getTime()
}; };
var etagProp = props['{' + Client.NS_DAV + '}getetag']; var etagProp = props['{' + Client.NS_DAV + '}getetag'];

10
core/js/tests/specs/files/clientSpec.js
View File

@ -252,7 +252,7 @@ describe('OC.Files.Client tests', function() {
expect(info.name).toEqual('One.txt'); expect(info.name).toEqual('One.txt');
expect(info.permissions).toEqual(31); expect(info.permissions).toEqual(31);
expect(info.size).toEqual(250); expect(info.size).toEqual(250);
expect(info.mtime.getTime()).toEqual(1436535485000); expect(info.mtime).toEqual(1436535485000);
expect(info.mimetype).toEqual('text/plain'); expect(info.mimetype).toEqual('text/plain');
expect(info.etag).toEqual('559fcabd79a38'); expect(info.etag).toEqual('559fcabd79a38');
@ -264,7 +264,7 @@ describe('OC.Files.Client tests', function() {
expect(info.name).toEqual('sub'); expect(info.name).toEqual('sub');
expect(info.permissions).toEqual(31); expect(info.permissions).toEqual(31);
expect(info.size).toEqual(100); expect(info.size).toEqual(100);
expect(info.mtime.getTime()).toEqual(1436536800000); expect(info.mtime).toEqual(1436536800000);
expect(info.mimetype).toEqual('httpd/unix-directory'); expect(info.mimetype).toEqual('httpd/unix-directory');
expect(info.etag).toEqual('66cfcabd79abb'); expect(info.etag).toEqual('66cfcabd79abb');
}); });
@ -295,7 +295,7 @@ describe('OC.Files.Client tests', function() {
expect(info.name).toEqual('文件夹'); expect(info.name).toEqual('文件夹');
expect(info.permissions).toEqual(31); expect(info.permissions).toEqual(31);
expect(info.size).toEqual(120); expect(info.size).toEqual(120);
expect(info.mtime.getTime()).toEqual(1436522405000); expect(info.mtime).toEqual(1436522405000);
expect(info.mimetype).toEqual('httpd/unix-directory'); expect(info.mimetype).toEqual('httpd/unix-directory');
expect(info.etag).toEqual('56cfcabd79abb'); expect(info.etag).toEqual('56cfcabd79abb');
@ -376,7 +376,7 @@ describe('OC.Files.Client tests', function() {
expect(info.name).toEqual('文件夹'); expect(info.name).toEqual('文件夹');
expect(info.permissions).toEqual(31); expect(info.permissions).toEqual(31);
expect(info.size).toEqual(120); expect(info.size).toEqual(120);
expect(info.mtime.getTime()).toEqual(1436522405000); expect(info.mtime).toEqual(1436522405000);
expect(info.mimetype).toEqual('httpd/unix-directory'); expect(info.mimetype).toEqual('httpd/unix-directory');
expect(info.etag).toEqual('56cfcabd79abb'); expect(info.etag).toEqual('56cfcabd79abb');
}); });
@ -425,7 +425,7 @@ describe('OC.Files.Client tests', function() {
expect(info.name).toEqual('in root'); expect(info.name).toEqual('in root');
expect(info.permissions).toEqual(31); expect(info.permissions).toEqual(31);
expect(info.size).toEqual(120); expect(info.size).toEqual(120);
expect(info.mtime.getTime()).toEqual(1436522405000); expect(info.mtime).toEqual(1436522405000);
expect(info.mimetype).toEqual('httpd/unix-directory'); expect(info.mimetype).toEqual('httpd/unix-directory');
expect(info.etag).toEqual('56cfcabd79abb'); expect(info.etag).toEqual('56cfcabd79abb');
}); });