Skip to content

[WIP] add full size preview if previews are disabled #512

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

Closed
sualko wants to merge 3 commits into from
Closed

[WIP] add full size preview if previews are disabled #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
337eb14
add full size preview if previews are disabled
sualko Feb 10, 2016
95f8dc8
limit number of fallback mediatypes, use core function for download url
sualko Feb 10, 2016
d9c5b6a
retrieve system value enable_previews
sualko Feb 11, 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
4 changes: 3 additions & 1 deletion controller/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ private function getConfig($extraMediaTypes = false) {
$mediaTypes =
$this->configService->getSupportedMediaTypes($extraMediaTypes, $nativeSvgSupport);

return ['features' => $features, 'mediatypes' => $mediaTypes];
$enablePreviews = \OC::$server->getConfig()->getSystemValue('enable_previews', true);

return ['features' => $features, 'mediatypes' => $mediaTypes, 'enablePreviews' => $enablePreviews];
}

/**
Expand Down
13 changes: 12 additions & 1 deletion js/galleryfileaction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,11 @@
c: file.etag,
requesttoken: oc_requesttoken
};
imageUrl = galleryFileAction.buildGalleryUrl('preview', '/' + file.id, params);
if (galleryFileAction.previewsDisabled) {
imageUrl = OCA.Files.Files.getDownloadUrl(file.name, dir);
} else {
imageUrl = galleryFileAction.buildGalleryUrl('preview', '/' + file.id, params);
}
params = {
c: file.etag,
requesttoken: oc_requesttoken
Expand Down Expand Up @@ -210,6 +214,13 @@ $(document).ready(function () {
var url = window.galleryFileAction.buildGalleryUrl('config', '', {extramediatypes: 1});
$.getJSON(url).then(function (config) {
window.galleryFileAction.buildFeaturesList(config.features);

if (!config.enablePreviews) {
config.mediatypes = ['image/png', 'image/jpeg', 'image/gif'];
window.galleryFileAction.previewsDisabled = true;
$('#gallery-button').remove();
}

window.galleryFileAction.register(config.mediatypes);
});
});