mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-09 00:06:55 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#222 with InputfieldImage thumbnail logic

Browse Source
This commit is contained in:
Ryan Cramer
2017-04-07 06:08:50 -04:00
parent 0714279ba9
commit 00e7a46434
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wire/modules/Inputfield/InputfieldImage/InputfieldImage.module
View File

@@ -302,7 +302,7 @@ class InputfieldImage extends InputfieldFile implements InputfieldItemList, Inpu
if(!$this->noAjax) { if(!$this->noAjax) {
$dropLabel = $this->uploadOnlyMode ? $this->labels['drag-drop'] : $this->labels['drag-drop-in']; $dropLabel = $this->uploadOnlyMode ? $this->labels['drag-drop'] : $this->labels['drag-drop-in'];
$refreshLabel = $this->_('legacy thumbnails will be re-created on save'); // $refreshLabel = $this->('legacy thumbnails will be re-created on save');
$out .= " $out .= "
<span class='AjaxUploadDropHere description'> <span class='AjaxUploadDropHere description'>
@@ -441,7 +441,6 @@ class InputfieldImage extends InputfieldFile implements InputfieldItemList, Inpu
$thumb = $img; $thumb = $img;
$error = ''; $error = '';
$attr = array(); $attr = array();
$is2x = false;
$_thumbHeight = $thumb->height; $_thumbHeight = $thumb->height;
$thumbHeight = $_thumbHeight; $thumbHeight = $_thumbHeight;
@@ -484,19 +483,18 @@ class InputfieldImage extends InputfieldFile implements InputfieldItemList, Inpu
$thumbHeight = $this->gridSize; $thumbHeight = $this->gridSize;
} }
$this->set('_hasLegacyThumbs', true); $this->set('_hasLegacyThumbs', true);
$is2x = false;
} else { } else {
// use new thumbnail size, 260px (scaled to 130px in output) // use new thumbnail size, 260px (scaled to 130px in output)
if($thumbWidth >= $thumbHeight && $thumbHeight > $gridSize2x) { if($thumbWidth >= $thumbHeight) {
if($thumbHeight > $gridSize2x) {
$thumb = $thumb->height($gridSize2x, $imageSizerOptions); $thumb = $thumb->height($gridSize2x, $imageSizerOptions);
$thumbHeight = $this->gridSize; $thumbHeight = $this->gridSize;
$thumbWidth = 0; $thumbWidth = 0;
$is2x = true; }
} else if($thumbWidth > $gridSize2x) { } else if($thumbWidth > $gridSize2x) {
$thumb = $thumb->width($gridSize2x, $imageSizerOptions); $thumb = $thumb->width($gridSize2x, $imageSizerOptions);
$thumbWidth = $this->gridSize; $thumbWidth = $this->gridSize;
$thumbHeight = 0; $thumbHeight = 0;
$is2x = true;
} }
} }
@@ -559,7 +557,7 @@ class InputfieldImage extends InputfieldFile implements InputfieldItemList, Inpu
$sanitizer = $this->wire('sanitizer'); $sanitizer = $this->wire('sanitizer');
$thumb = $this->getAdminThumb($pagefile, false); $thumb = $this->getAdminThumb($pagefile, false);
$fileStats = str_replace(' ', '&nbsp;', $pagefile->filesizeStr) . ", {$pagefile->width}&times;{$pagefile->height} "; $fileStats = str_replace(' ', '&nbsp;', $pagefile->filesizeStr) . ", {$pagefile->width}&times;{$pagefile->height} ";
$gridSize = $this->gridSize; // $gridSize = $this->gridSize;
// <div class='gridImage__overflow' style='width: {$gridSize}px; height: {$gridSize}px'> // <div class='gridImage__overflow' style='width: {$gridSize}px; height: {$gridSize}px'>
$out = $this->getTooltip($pagefile) . " $out = $this->getTooltip($pagefile) . "
@@ -700,6 +698,7 @@ class InputfieldImage extends InputfieldFile implements InputfieldItemList, Inpu
if(!$this->useImageEditor) return ''; if(!$this->useImageEditor) return '';
if($n) {} // ignore, $n is for hooks
$pageID = $pagefile->pagefiles->page->id; $pageID = $pagefile->pagefiles->page->id;
$variations = $this->getPagefileVariations($pagefile); $variations = $this->getPagefileVariations($pagefile);
$variationCount = count($variations); $variationCount = count($variations);