summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2013-08-23 23:19:21 +0200
committerGeorg Ehrke <developer@georgehrke.com>2013-08-23 23:19:21 +0200
commit13e34649bfb1a7d15833c209d629e3540d3366ef (patch)
treebb4680a9b677afda406edca24d6ced62ae4a4559 /apps/files
parent6ffa2a28d0ae63b061e1e88ee3b12726d31c3f9d (diff)
downloadnextcloud-server-13e34649bfb1a7d15833c209d629e3540d3366ef.tar.gz
nextcloud-server-13e34649bfb1a7d15833c209d629e3540d3366ef.zip
move path generation for previews to dedicated function
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/filelist.js2
-rw-r--r--apps/files/js/files.js9
2 files changed, 8 insertions, 3 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 41245c00ba6..e3e985af38b 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -185,7 +185,7 @@ var FileList={
if (id != null) {
tr.attr('data-id', id);
}
- var path = $('#dir').val()+'/'+name;
+ var path = getPathForPreview(name);
lazyLoadPreview(path, mime, function(previewpath){
tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
});
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index f88ecd961b1..79fa01aa0aa 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -382,7 +382,7 @@ $(document).ready(function() {
tr.attr('data-size',result.data.size);
tr.attr('data-id', result.data.id);
tr.find('.filesize').text(humanFileSize(result.data.size));
- var path = $('#dir').val() + '/' + name;
+ var path = getPathForPreview(name);
lazyLoadPreview(path, result.data.mime, function(previewpath){
tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
});
@@ -654,7 +654,7 @@ var createDragShadow = function(event){
if (elem.type === 'dir') {
newtr.find('td.filename').attr('style','background-image:url('+OC.imagePath('core', 'filetypes/folder.png')+')');
} else {
- var path = $('#dir').val()+'/'+elem.name;
+ var path = getPathForPreview(elem.name);
lazyLoadPreview(path, elem.mime, function(previewpath){
newtr.find('td.filename').attr('style','background-image:url('+previewpath+')');
});
@@ -832,6 +832,11 @@ function getMimeIcon(mime, ready){
}
getMimeIcon.cache={};
+function getPathForPreview(name) {
+ var path = $('#dir').val() + '/' + name;
+ return path;
+}
+
function lazyLoadPreview(path, mime, ready) {
getMimeIcon(mime,ready);
var x = $('#filestable').data('preview-x');