diff --git a/apps/files_versions/js/versioncollection.js b/apps/files_versions/js/versioncollection.js index fdb12bae0a958941b84ae5033cfda8e056a40af5..24a4ba7fc626cbbe2780067711915277e048609e 100644 Binary files a/apps/files_versions/js/versioncollection.js and b/apps/files_versions/js/versioncollection.js differ diff --git a/apps/files_versions/js/versionstabview.js b/apps/files_versions/js/versionstabview.js index 35abde6d34a3abbfd96c1c9b3479a7f8b2a50e40..a91366fd40a786d3894e2ca2184150680ca3693d 100644 Binary files a/apps/files_versions/js/versionstabview.js and b/apps/files_versions/js/versionstabview.js differ diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php index e7c2c8b7593224a85e774352c2ea356984fbe930..1aa19274c48cacdee04777715dca08c94165c0c9 100644 --- a/apps/files_versions/lib/Storage.php +++ b/apps/files_versions/lib/Storage.php @@ -467,6 +467,7 @@ class Storage { $versions[$key]['path'] = Filesystem::normalizePath($pathinfo['dirname'] . '/' . $filename); $versions[$key]['name'] = $versionedFile; $versions[$key]['size'] = $view->filesize($dir . '/' . $entryName); + $versions[$key]['mimetype'] = \OC::$server->getMimeTypeDetector()->detectPath($versionedFile); } } } diff --git a/apps/files_versions/tests/js/versionstabviewSpec.js b/apps/files_versions/tests/js/versionstabviewSpec.js index 9b788db197093b9dadef6577707c183b4dcd0aa4..cadd4eb363e76ba566fc5e048baff433eea4ae1e 100644 --- a/apps/files_versions/tests/js/versionstabviewSpec.js +++ b/apps/files_versions/tests/js/versionstabviewSpec.js @@ -24,14 +24,16 @@ describe('OCA.Versions.VersionsTabView', function() { timestamp: time1, name: 'some file.txt', size: 140, - fullPath: '/subdir/some file.txt' + fullPath: '/subdir/some file.txt', + mimetype: 'text/plain' }); var version2 = new VersionModel({ id: time2, timestamp: time2, name: 'some file.txt', size: 150, - fullPath: '/subdir/some file.txt' + fullPath: '/subdir/some file.txt', + mimetype: 'text/plain' }); testVersions = [version1, version2]; @@ -80,14 +82,14 @@ describe('OCA.Versions.VersionsTabView', function() { expect($item.find('.versiondate').text()).toEqual('seconds ago'); expect($item.find('.size').text()).toEqual('< 1 KB'); expect($item.find('.revertVersion').length).toEqual(1); - expect($item.find('.preview').attr('src')).toEqual(version1.getPreviewUrl()); + expect($item.find('.preview').attr('src')).toEqual('http://localhost/core/img/filetypes/text.svg'); $item = $versions.eq(1); expect($item.find('.downloadVersion').attr('href')).toEqual(version2.getDownloadUrl()); expect($item.find('.versiondate').text()).toEqual('2 days ago'); expect($item.find('.size').text()).toEqual('< 1 KB'); expect($item.find('.revertVersion').length).toEqual(1); - expect($item.find('.preview').attr('src')).toEqual(version2.getPreviewUrl()); + expect($item.find('.preview').attr('src')).toEqual('http://localhost/core/img/filetypes/text.svg'); }); it('does not render revert button when no update permissions', function() { @@ -104,13 +106,13 @@ describe('OCA.Versions.VersionsTabView', function() { expect($item.find('.downloadVersion').attr('href')).toEqual(version1.getDownloadUrl()); expect($item.find('.versiondate').text()).toEqual('seconds ago'); expect($item.find('.revertVersion').length).toEqual(0); - expect($item.find('.preview').attr('src')).toEqual(version1.getPreviewUrl()); + expect($item.find('.preview').attr('src')).toEqual('http://localhost/core/img/filetypes/text.svg'); $item = $versions.eq(1); expect($item.find('.downloadVersion').attr('href')).toEqual(version2.getDownloadUrl()); expect($item.find('.versiondate').text()).toEqual('2 days ago'); expect($item.find('.revertVersion').length).toEqual(0); - expect($item.find('.preview').attr('src')).toEqual(version2.getPreviewUrl()); + expect($item.find('.preview').attr('src')).toEqual('http://localhost/core/img/filetypes/text.svg'); }); }); @@ -156,7 +158,8 @@ describe('OCA.Versions.VersionsTabView', function() { timestamp: time3, name: 'some file.txt', size: 54, - fullPath: '/subdir/some file.txt' + fullPath: '/subdir/some file.txt', + mimetype: 'text/plain' }); tabView.collection.add(version3); @@ -167,7 +170,7 @@ describe('OCA.Versions.VersionsTabView', function() { expect($item.find('.downloadVersion').attr('href')).toEqual(version3.getDownloadUrl()); expect($item.find('.versiondate').text()).toEqual('7 days ago'); expect($item.find('.revertVersion').length).toEqual(1); - expect($item.find('.preview').attr('src')).toEqual(version3.getPreviewUrl()); + expect($item.find('.preview').attr('src')).toEqual('http://localhost/core/img/filetypes/text.svg'); }); });