Skip to content
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

ImageMedium#derivatives now works with image filters #1107

Merged
merged 10 commits into from
Oct 23, 2016
Merged

ImageMedium#derivatives now works with image filters #1107

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6a55f7f
ImageMedium->derivatives now works with image filters
fredrikekelund Sep 11, 2016
c2e6292
Modified initialization of image alternatives
fredrikekelund Sep 12, 2016
4d19620
Fully reset image when derivatives method is called
fredrikekelund Sep 12, 2016
7efd55d
Account for risk of original file not existing when generating image …
fredrikekelund Oct 1, 2016
07c9591
Fixed an issue where too many alternatives would be generated
fredrikekelund Oct 5, 2016
25636f5
Merge branch 'develop' into imageDerivativesFilters
fredrikekelund Oct 15, 2016
1d2cc2c
Add an "@1x" alternative when an image lacks a base medium
fredrikekelund Oct 15, 2016
778cc1b
Always make smallest image alternative the base medium
fredrikekelund Oct 16, 2016
91cea78
Set better prettynames for image derivatives
fredrikekelund Oct 16, 2016
baa1d87
Changed image derivatives prettynames to be width based
fredrikekelund Oct 21, 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
Prev Previous commit
Next Next commit
Set better prettynames for image derivatives
  • Loading branch information
@fredrikekelund
fredrikekelund committed Oct 16, 2016
commit 91cea78a84b6dd50d9dba2dda315de4b638ab58e
16 changes: 13 additions & 3 deletions system/src/Grav/Common/Page/Medium/ImageMedium.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,12 +266,22 @@ public function derivatives($min_width, $max_width, $step = 200) {
// original image file no longer exists and this class instance was
// retrieved from the page cache
if (isset($derivative)) {
$ratio = $base->get('width') / $width;
$height = $derivative->get('height') / $ratio;
$index = 2;
$widths = array_keys($this->alternatives);
sort($widths);

foreach ($widths as $i => $key) {
if ($width > $key) {
$index += max($i, 1);
}
}

$basename = preg_replace('/(@\d+x)*$/', "@{$ratio}x", $base->get('basename'), 1);
$basename = preg_replace('/(@\d+x)*$/', "@{$index}x", $base->get('basename'), 1);
$derivative->setImagePrettyName($basename);

$ratio = $base->get('width') / $width;
$height = $derivative->get('height') / $ratio;

$derivative->resize($width, $height);
$derivative->set('width', $width);
$derivative->set('height', $height);
Expand Down