Fixed #51 bug with mixed-up image alt and title

madeyourday · Mar 14, 2018 · e74cfca · e74cfca
1 parent 8b70b49
commit e74cfca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/Module/Slider.php b/src/Module/Slider.php
@@ -178,7 +178,8 @@ protected function compile()
 					'uuid'      => isset($files->uuid) ? $files->uuid : null,
 					'name'      => $file->basename,
 					'singleSRC' => $files->path,
-					'alt'       => $arrMeta['title'],
+					'alt'       => $arrMeta['alt'],
+					'title'     => $arrMeta['title'],
 					'imageUrl'  => $arrMeta['link'],
 					'caption'   => $arrMeta['caption'],
 				);
@@ -439,7 +440,8 @@ protected function parseSlides($objSlides)
 					'id' => $file->id,
 					'name' => $fileObject->basename,
 					'singleSRC' => $file->path,
-					'alt' => $meta['title'],
+					'alt' => $meta['alt'],
+					'title' => $meta['title'],
 					'imageUrl' => $meta['link'],
 					'caption' => $meta['caption'],
 					'size' => isset($this->imgSize) ? $this->imgSize : $this->size,
@@ -469,6 +471,7 @@ protected function parseSlides($objSlides)
 				}
 				$slide['image']->imgSize = '';
 				$slide['image']->alt = '';
+				$slide['image']->title = '';
 				$slide['image']->picture = array(
 					'img' => array('src' => $slide['image']->src, 'srcset' => $slide['image']->src),
 					'sources' => array(),
@@ -504,7 +507,8 @@ protected function parseSlides($objSlides)
 					'id' => $file->id,
 					'name' => $fileObject->basename,
 					'singleSRC' => $file->path,
-					'alt' => $meta['title'],
+					'alt' => $meta['alt'],
+					'title' => $meta['title'],
 					'imageUrl' => $meta['link'],
 					'caption' => $meta['caption'],
 					'size' => $slide['backgroundImageSize'],

diff --git a/src/Resources/contao/templates/rsts_default.html5 b/src/Resources/contao/templates/rsts_default.html5
@@ -19,12 +19,12 @@
 		?>
 
 		<?php if ($loadLazy): ?>
-			<script type="text/html"<?php if ($image->picture['alt']): ?> data-rsts-name="<?= $image->picture['alt'] ?>"<?php endif ?><?php if (!empty($image->thumb->src)): ?> data-rsts-thumb="<?= $image->thumb->src ?>"<?php endif ?>>
+			<script type="text/html"<?php if ($image->linkTitle || $image->picture['alt']): ?> data-rsts-name="<?= $image->linkTitle ?: $image->picture['alt'] ?>"<?php endif ?><?php if (!empty($image->thumb->src)): ?> data-rsts-thumb="<?= $image->thumb->src ?>"<?php endif ?>>
 			<?php ob_start() ?>
 		<?php endif ?>
 
 		<?php if ($this->fullsize && !$image->href) {
-			$lightboxUrls[] = array(TL_FILES_URL . $image->singleSRC, $image->picture['alt']);
+			$lightboxUrls[] = array(TL_FILES_URL . $image->singleSRC, $image->linkTitle ?: $image->picture['alt']);
 		} ?>
 
 		<?php
@@ -34,7 +34,7 @@
 			);
 			if ($image->href || $this->fullsize) {
 				$tagName = 'a';
-				$attributes[] = 'title="' . $image->picture['alt'] . '"';
+				$attributes[] = 'title="' . ($image->linkTitle ?: $image->picture['alt']) . '"';
 			}
 			if ($image->href) {
 				$attributes[] = 'href="' . $image->href . '"';
@@ -168,6 +168,9 @@
 				$tagName = 'a';
 				if ($slide['image']->href) {
 					$attributes .= ' href="' . $slide['image']->href . '"';
+					if ($slide['image']->linkTitle) {
+						$attributes .= ' title="' . $slide['image']->linkTitle . '"';
+					}
 					if ($this->fullsize) {
 						$attributes .= ' target="_blank"';
 					}