Skip to content

Filepicker styling #1756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 2 commits into from
Oct 14, 2016
Merged

Filepicker styling #1756

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d093e9
use mimetype icons in filepicker if there is no preview
icewind1991 Oct 14, 2016
6d43942
filepicker styling
icewind1991 Oct 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
use mimetype icons in filepicker if there is no preview 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Oct 14, 2016
commit 8d093e976acd818311e3be97b0d9afd6631632f2
11 changes: 9 additions & 2 deletions core/js/oc-dialogs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,10 +769,17 @@ var OCdialogs = {
});
if (entry.type === 'file') {
var urlSpec = {
file: dir + '/' + entry.name
file: dir + '/' + entry.name,
};
$li.find('img').attr('src', OC.MimeType.getIconUrl(entry.mimetype));
var img = new Image();
var previewUrl = OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
$li.find('img').attr('src', previewUrl);
img.onload = function() {
if (img.width > 5) {
$li.find('img').attr('src', previewUrl);
}
};
img.src = previewUrl;
}
else {
$li.find('img').attr('src', OC.Util.replaceSVGIcon(entry.icon));
Expand Down