diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php
index d5edd068cdb9e8d7881396bcc86aa51ae512b027..65c8deb4427a3326b15ec5adbde95d44c9fa54dc 100644
--- a/apps/files/appinfo/routes.php
+++ b/apps/files/appinfo/routes.php
@@ -76,6 +76,11 @@ $application->registerRoutes(
'url' => '/api/v1/showhidden',
'verb' => 'POST'
],
+ [
+ 'name' => 'API#cropImagePreviews',
+ 'url' => '/api/v1/cropimagepreviews',
+ 'verb' => 'POST'
+ ],
[
'name' => 'API#showGridView',
'url' => '/api/v1/showgridview',
diff --git a/apps/files/js/app.js b/apps/files/js/app.js
index 09468205279d77cf378156b9c97bb987bbae4d98..8015f395b7479bf1d0c49ac780024d22d7008630 100644
--- a/apps/files/js/app.js
+++ b/apps/files/js/app.js
@@ -56,13 +56,18 @@
var showHidden = $('#showHiddenFiles').val() === "1";
this.$showHiddenFiles.prop('checked', showHidden);
+ // crop image previews
+ this.$cropImagePreviews = $('input#cropimagepreviewsToggle');
+ var cropImagePreviews = $('#cropImagePreviews').val() === "1";
+ this.$cropImagePreviews.prop('checked', cropImagePreviews);
if ($('#fileNotFound').val() === "1") {
OC.Notification.show(t('files', 'File could not be found'), {type: 'error'});
}
this._filesConfig = new OC.Backbone.Model({
- showhidden: showHidden
+ showhidden: showHidden,
+ cropimagepreviews: cropImagePreviews,
});
var urlParams = OC.Util.History.parseUrlQuery();
@@ -132,6 +137,7 @@
});
this._debouncedPersistShowHiddenFilesState = _.debounce(this._persistShowHiddenFilesState, 1200);
+ this._debouncedPersistCropImagePreviewsState = _.debounce(this._persistCropImagePreviewsState, 1200);
if (sessionStorage.getItem('WhatsNewServerCheck') < (Date.now() - 3600*1000)) {
OCP.WhatsNew.query(); // for Nextcloud server
@@ -231,6 +237,7 @@
$('#app-navigation').on('itemChanged', _.bind(this._onNavigationChanged, this));
this.$showHiddenFiles.on('change', _.bind(this._onShowHiddenFilesChange, this));
+ this.$cropImagePreviews.on('change', _.bind(this._onCropImagePreviewsChange, this));
},
/**
@@ -256,6 +263,29 @@
});
},
+ /**
+ * Toggle cropping image previews according to the settings checkbox
+ *
+ * @returns void
+ */
+ _onCropImagePreviewsChange: function() {
+ var crop = this.$cropImagePreviews.is(':checked');
+ this._filesConfig.set('cropimagepreviews', crop);
+ this._debouncedPersistCropImagePreviewsState();
+ },
+
+ /**
+ * Persist crop image previews preference on the server
+ *
+ * @returns void
+ */
+ _persistCropImagePreviewsState: function() {
+ var crop = this._filesConfig.get('cropimagepreviews');
+ $.post(OC.generateUrl('/apps/files/api/v1/cropimagepreviews'), {
+ crop: crop
+ });
+ },
+
/**
* Event handler for when the current navigation item has changed
*/
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 30bc35551d62de9509c43c74c239fe60fe3de80a..11d0bc4511dac56d28bbb1657cda106a9225ab43 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -252,7 +252,8 @@
this._filesConfig = OCA.Files.App.getFilesConfig();
} else {
this._filesConfig = new OC.Backbone.Model({
- 'showhidden': false
+ 'showhidden': false,
+ 'cropimagepreviews': true
});
}
@@ -291,6 +292,10 @@
}
});
+ this._filesConfig.on('change:cropimagepreviews', function() {
+ self.reload();
+ });
+
this.$el.toggleClass('hide-hidden-files', !this._filesConfig.get('showhidden'));
}
@@ -2215,6 +2220,12 @@
urlSpec.y = Math.ceil(urlSpec.y);
urlSpec.forceIcon = 0;
+ /**
+ * Images are cropped to a square by default. Append a=1 to the URL
+ * if the user wants to see images with original aspect ratio.
+ */
+ urlSpec.a = this._filesConfig.get('cropimagepreviews') ? 0 : 1;
+
if (typeof urlSpec.fileId !== 'undefined') {
delete urlSpec.file;
return OC.generateUrl('/core/preview?') + $.param(urlSpec);
diff --git a/apps/files/lib/Controller/ApiController.php b/apps/files/lib/Controller/ApiController.php
index 206ddbd6ed62c1a1e4135c45a890a0cb3924ab4d..0cf261af726788eb9a6719ded0dcd048415a75be 100644
--- a/apps/files/lib/Controller/ApiController.php
+++ b/apps/files/lib/Controller/ApiController.php
@@ -280,6 +280,20 @@ class ApiController extends Controller {
return new Response();
}
+ /**
+ * Toggle default for cropping preview images
+ *
+ * @NoAdminRequired
+ *
+ * @param bool $crop
+ * @return Response
+ * @throws \OCP\PreConditionNotMetException
+ */
+ public function cropImagePreviews($crop) {
+ $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'crop_image_previews', (int)$crop);
+ return new Response();
+ }
+
/**
* Toggle default for files grid view
*
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index 9107573752572af4a62cd8870939b5103c9e608e..364735437e4e2f57fd54cf0324c938e8180417b6 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -296,6 +296,8 @@ class ViewController extends Controller {
$params['isIE'] = \OCP\Util::isIE();
$showHidden = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
$params['showHiddenFiles'] = $showHidden ? 1 : 0;
+ $cropImagePreviews = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'crop_image_previews', true);
+ $params['cropImagePreviews'] = $cropImagePreviews ? 1 : 0;
$params['fileNotFound'] = $fileNotFound ? 1 : 0;
$params['appNavigation'] = $nav;
$params['appContents'] = $contentItems;
diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php
index f57295e88879c09668270eaead2e3af6bddb1363..8e65456794675348f71a1629e9933114cb668ee6 100644
--- a/apps/files/templates/appnavigation.php
+++ b/apps/files/templates/appnavigation.php
@@ -44,6 +44,11 @@ script(\OCA\Files\AppInfo\Application::APP_ID, 'dist/files-app-settings');
checked="checked" type="checkbox">
<label for="showhiddenfilesToggle"><?php p($l->t('Show hidden files')); ?></label>
</div>
+ <div id="files-setting-cropimagepreviews">
+ <input class="checkbox" id="cropimagepreviewsToggle"
+ checked="checked" type="checkbox">
+ <label for="cropimagepreviewsToggle"><?php p($l->t('Crop image previews')); ?></label>
+ </div>
<label for="webdavurl"><?php p($l->t('WebDAV')); ?></label>
<input id="webdavurl" type="text" readonly="readonly"
value="<?php p($_['webdav_url']); ?>"/>
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 3ba0474daaf2c19c2eaa8170ebadf802cd228605..8b6e2b0b91b0a2bda5753c160eb12fa3c420485e 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -28,6 +28,7 @@
<input type="hidden" name="defaultFileSorting" id="defaultFileSorting" value="<?php p($_['defaultFileSorting']) ?>" />
<input type="hidden" name="defaultFileSortingDirection" id="defaultFileSortingDirection" value="<?php p($_['defaultFileSortingDirection']) ?>" />
<input type="hidden" name="showHiddenFiles" id="showHiddenFiles" value="<?php p($_['showHiddenFiles']); ?>" />
+<input type="hidden" name="cropImagePreviews" id="cropImagePreviews" value="<?php p($_['cropImagePreviews']); ?>" />
<?php endif;
foreach ($_['hiddenFields'] as $name => $value) {?>
diff --git a/apps/files/tests/Controller/ApiControllerTest.php b/apps/files/tests/Controller/ApiControllerTest.php
index afef351aea72d4590998c255e92873eebda65ae0..1fb6490f1432388f8ace1b154571fef4087753f8 100644
--- a/apps/files/tests/Controller/ApiControllerTest.php
+++ b/apps/files/tests/Controller/ApiControllerTest.php
@@ -246,4 +246,17 @@ class ApiControllerTest extends TestCase {
$this->assertEquals($expected, $actual);
}
+
+ public function testCropImagePreviews() {
+ $crop = true;
+
+ $this->config->expects($this->once())
+ ->method('setUserValue')
+ ->with($this->user->getUID(), 'files', 'crop_image_previews', $crop);
+
+ $expected = new Http\Response();
+ $actual = $this->apiController->cropImagePreviews($crop);
+
+ $this->assertEquals($expected, $actual);
+ }
}
diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php
index 2b40697642cb732695f81d37e647edbc6ffca142..fc2b82de9c846ae93260634987c27af221b7f75b 100644
--- a/apps/files/tests/Controller/ViewControllerTest.php
+++ b/apps/files/tests/Controller/ViewControllerTest.php
@@ -135,6 +135,7 @@ class ViewControllerTest extends TestCase {
[$this->user->getUID(), 'files', 'file_sorting', 'name', 'name'],
[$this->user->getUID(), 'files', 'file_sorting_direction', 'asc', 'asc'],
[$this->user->getUID(), 'files', 'show_hidden', false, false],
+ [$this->user->getUID(), 'files', 'crop_image_previews', true, true],
[$this->user->getUID(), 'files', 'show_grid', true],
]);
@@ -316,6 +317,7 @@ class ViewControllerTest extends TestCase {
'defaultFileSorting' => 'name',
'defaultFileSortingDirection' => 'asc',
'showHiddenFiles' => 0,
+ 'cropImagePreviews' => 1,
'fileNotFound' => 0,
'allowShareWithLink' => 'yes',
'appNavigation' => $nav,