summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2013-09-03 22:35:58 -0700
committerMorris Jobke <morris.jobke@gmail.com>2013-09-03 22:35:58 -0700
commit6435e18e95bc283af051d141fad204660d7f7eba (patch)
treea532eb2396cc7f1b47db7de3c802815a2b38d8b1
parentc2eaf7589d53bd3d0dff235fa25efdeba5595142 (diff)
parentd62c5063f420a0ec69d606aea086d40fe027da47 (diff)
downloadnextcloud-server-6435e18e95bc283af051d141fad204660d7f7eba.tar.gz
nextcloud-server-6435e18e95bc283af051d141fad204660d7f7eba.zip
Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker
Add previews to OC.dialogs.filepicker()
-rw-r--r--core/js/oc-dialogs.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 6b768641586..f184a1022bc 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -285,7 +285,11 @@ var OCdialogs = {
filename: entry.name,
date: OC.mtime2date(entry.mtime)
});
- $li.find('img').attr('src', entry.mimetype_icon);
+ if (entry.mimetype === "httpd/unix-directory") {
+ $li.find('img').attr('src', OC.imagePath('core', 'filetypes/folder.png'));
+ } else {
+ $li.find('img').attr('src', OC.Router.generate('core_ajax_preview', {x:32, y:32, file:escapeHTML(dir+'/'+entry.name)}) );
+ }
self.$filelist.append($li);
});