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

Jump to bottom

[Bugfix] take care of absRefPrefix for images #20

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[Bugfix] take care of absRefPrefix for images #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00818a8
[Bugfix] take care of absRefPrefix for images
hannesbochmann Jul 24, 2018
ef08b11
[Cleanup] fix CS
hannesbochmann Jul 24, 2018
81f1312
[Bugfix] fixed instatiating of ImageService
hannesbochmann Jul 25, 2018
51d3b9d
cleanup use packagist for be_acl
hannesbochmann Jan 29, 2019
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
9 changes: 8 additions & 1 deletion Classes/Controller/ImageRenderingController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

use TYPO3\CMS\Core\Resource;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Service\ImageService;
use TYPO3\CMS\Extbase\Object\ObjectManager;

/**
* Render the image attributes and reconstruct magic images, if necessary (and possible)
Expand Down Expand Up @@ -76,6 +78,8 @@ public function renderImageAttributes($content = '', $conf)
if ($fileUid) {
try {
$file = Resource\ResourceFactory::getInstance()->getFileObject($fileUid);
$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
$imageService = $objectManager->get(ImageService::class);
if ($imageAttributes['src'] !== $file->getPublicUrl()) {
// Source file is a processed image
$imageConfiguration = [
Expand All @@ -84,13 +88,15 @@ public function renderImageAttributes($content = '', $conf)
];
$processedFile = $this->getMagicImageService()->createMagicImage($file, $imageConfiguration);
$additionalAttributes = [
'src' => $processedFile->getPublicUrl(),
'src' => $imageService->getImageUri($processedFile),
'title' => $imageAttributes['title'] ?: $file->getProperty('title'),
'alt' => $imageAttributes['alt'] ?: $file->getProperty('alternative'),
'width' => $processedFile->getProperty('width'),
'height' => $processedFile->getProperty('height'),
];
$imageAttributes = array_merge($imageAttributes, $additionalAttributes);
} else {
$imageAttributes['src'] = $imageService->getImageUri($file);
}
} catch (Resource\Exception\FileDoesNotExistException $fileDoesNotExistException) {
// Log the fact the file could not be retrieved.
Expand All @@ -99,6 +105,7 @@ public function renderImageAttributes($content = '', $conf)
}
}
}

return '<img ' . GeneralUtility::implodeAttributes($imageAttributes, true, true) . ' />';
}

Expand Down
2 changes: 1 addition & 1 deletion Resources/Public/JavaScript/Plugins/TableOperations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1459,7 +1459,7 @@ define([
* @param {Object} params The field values entered in the form
*/
setHeaders: function (table, params) {
var headers = params.f_headers;
var headers = params.typeof;
var doc = this.editor.document;
var tbody = table.tBodies[0];
var thead = table.tHead;
Expand Down