Merge pull request #322 from t3solution/5.2.13

BUGFIX release v5.2.13
t3solution · May 1, 2023 · 2ea4965 · 2ea4965
2 parents e7d98c0 + cea25f9
commit 2ea4965
Show file tree

Hide file tree

Showing 18 changed files with 61 additions and 21 deletions.
diff --git a/Classes/DataProcessing/GalleryProcessor.php b/Classes/DataProcessing/GalleryProcessor.php
@@ -503,8 +503,10 @@ protected function calculateMediaWidthsAndHeights()
 						$mediaHeight = '';
 					} else {
 						$ratio = '';
-						$mediaHeight = $this->getCroppedDimensionalProperty($fileObject, 'height')
-						 * ($mediaWidth / max($this->getCroppedDimensionalProperty($fileObject, 'width'), 1));
+						if ($fileObject instanceof \TYPO3\CMS\Core\Resource\FileReference) {
+							$mediaHeight = $this->getCroppedDimensionalProperty($fileObject, 'height')
+							 * ($mediaWidth / max($this->getCroppedDimensionalProperty($fileObject, 'width'), 1));
+						}
 					}
 
 					$mediaHeight = !empty($mediaHeight) ? floor($mediaHeight) : '';
@@ -523,9 +525,10 @@ protected function calculateMediaWidthsAndHeights()
 							$fileObject = $fO;
 						}
 					}
-					$mediaHeight = $this->getCroppedDimensionalProperty($fileObject, 'height')
-					 * ($mediaWidth / max($this->getCroppedDimensionalProperty($fileObject, 'width'), 1));
-
+					if ($fileObject instanceof \TYPO3\CMS\Core\Resource\FileReference) {
+						$mediaHeight = $this->getCroppedDimensionalProperty($fileObject, 'height')
+						* ($mediaWidth / max($this->getCroppedDimensionalProperty($fileObject, 'width'), 1));
+					}
 					$mediaHeight = !empty($mediaHeight) ? floor($mediaHeight) : '';
 					$this->mediaDimensions[$key] = [
 						'width' => floor($mediaWidth),
@@ -544,9 +547,10 @@ protected function calculateMediaWidthsAndHeights()
 				if (is_array($fileObject)) {
 					$fileObject = $fileObject[0];
 				}
-				$mediaWidth = $this->getCroppedDimensionalProperty($fileObject, 'width')
-				 * ($mediaHeight / max($this->getCroppedDimensionalProperty($fileObject, 'height'), 1));
-
+				if ($fileObject instanceof \TYPO3\CMS\Core\Resource\FileReference) {
+					$mediaWidth = $this->getCroppedDimensionalProperty($fileObject, 'width')
+					 * ($mediaHeight / max($this->getCroppedDimensionalProperty($fileObject, 'height'), 1));
+				}
 				$mediaHeight = !empty($mediaHeight) ? floor($mediaHeight) : '';
 				$this->mediaDimensions[$key] = [
 					'width' => floor($mediaWidth),
@@ -644,13 +648,13 @@ protected function calculateMediaWidthsAndHeights()
 				if ($fileObject instanceof \TYPO3\CMS\Core\Resource\FileReference) {
 					$mediaHeight = $this->getCroppedDimensionalProperty($fileObject, 'height')
 					 * ($mediaWidth / max($this->getCroppedDimensionalProperty($fileObject, 'width'), 1));
-					$mediaHeight = !empty($mediaHeight) ? floor($mediaHeight) : '';
-					$this->mediaDimensions[$key] = [
-						'width' => floor($mediaWidth),
-						'height' => $mediaHeight,
-						'ratio' => $ratio
-					];
 				}
+				$mediaHeight = !empty($mediaHeight) ? floor($mediaHeight) : '';
+				$this->mediaDimensions[$key] = [
+					'width' => floor($mediaWidth),
+					'height' => $mediaHeight,
+					'ratio' => $ratio
+				];
 			}
 		}
 

diff --git a/Classes/Domain/Model/Config.php b/Classes/Domain/Model/Config.php
@@ -177,7 +177,7 @@ class Config extends AbstractEntity
 	 *
 	 * @var bool
 	 */
-	protected $navbarDarkMode = '';
+	protected $navbarDarkMode = false;
 
 
 	/**

diff --git a/Classes/ViewHelpers/MediaViewHelper.php b/Classes/ViewHelpers/MediaViewHelper.php
@@ -370,6 +370,7 @@ protected function getCropString($image, $cropString)
 				}
 
 				if ( $this->arguments['shift'] || $this->arguments['hshift'] ) {
+
 					if ( $cropedWidth > $cropedHeight ) {
 						// landscape
 						$shift = $cropObject->$cropVariant->cropArea->x + $this->arguments['hshift']/100;

diff --git a/Resources/Private/Extensions/news/Resources/Private/Partials/Detail/T3sbMediaContainer.html b/Resources/Private/Extensions/news/Resources/Private/Partials/Detail/T3sbMediaContainer.html
@@ -163,6 +163,8 @@ <h5>{file.title -> f:format.html()}</h5>
 		picturefill="{settings.picturefill}"
 		lazyload="0"
 		ratio="{settings.detail.imageRatio}"
+		shift="{file.properties.tx_t3sbootstrap_shift_vertical}"
+		hshift="{file.properties.tx_t3sbootstrap_shift_horizontal}"
 	/>
 </figure>
 </f:section>
diff --git a/Resources/Private/Extensions/news/Resources/Private/Partials/Detail/T3sbMediaImage.html b/Resources/Private/Extensions/news/Resources/Private/Partials/Detail/T3sbMediaImage.html
@@ -109,6 +109,8 @@
 		picturefill="{settings.picturefill}"
 		lazyload="{settings.lazyLoad}"
 		ratio="{settings.detail.imageRatio}"
+		shift="{file.properties.tx_t3sbootstrap_shift_vertical}"
+		hshift="{file.properties.tx_t3sbootstrap_shift_horizontal}"
 	/>
 	<f:if condition="{settings.detail.lightbox.enabled} && {settings.magnifying}">
 		<div class="zoom-overlay{f:if(condition: file.description, then: ' description')}" style="max-width: {width}px;">

diff --git a/Resources/Private/Extensions/news/Resources/Private/Partials/List/Media/Image.html b/Resources/Private/Extensions/news/Resources/Private/Partials/List/Media/Image.html
@@ -90,6 +90,8 @@
 		picturefill="{settings.picturefill}"
 		lazyload="{settings.lazyLoad}"
 		ratio="{ratio}"
+		shift="{file.properties.tx_t3sbootstrap_shift_vertical}"
+		hshift="{file.properties.tx_t3sbootstrap_shift_horizontal}"
 	/>
 </figure>
 </html>
diff --git a/Resources/Private/Partials/Content/Card/FlipCard.html b/Resources/Private/Partials/Content/Card/FlipCard.html
@@ -83,6 +83,8 @@
 	 picturefill="{settings.picturefill}"
 	 lazyload="{lazyload}"
 	 ratio="{ratio}"
+	 shift="{file.properties.tx_t3sbootstrap_shift_vertical}"
+	 hshift="{file.properties.tx_t3sbootstrap_shift_horizontal}"
 	/>
 </figure>
 

diff --git a/Resources/Private/Partials/Content/Card/ProfileCard.html b/Resources/Private/Partials/Content/Card/ProfileCard.html
@@ -151,6 +151,8 @@
 			 picturefill="{settings.picturefill}"
 			 lazyload="{lazyload}"
 			 ratio="{addmedia.ratio}"
+			 shift="{file.properties.tx_t3sbootstrap_shift_vertical}"
+			 hshift="{file.properties.tx_t3sbootstrap_shift_horizontal}"
 			/>
 		</figure>
 	</f:if>
@@ -270,6 +272,8 @@
 			 picturefill="{settings.picturefill}"
 			 lazyload="{lazyload}"
 			 ratio="1:1"
+			 shift="{file.properties.tx_t3sbootstrap_shift_vertical}"
+			 hshift="{file.properties.tx_t3sbootstrap_shift_horizontal}"
 			/>
 		</figure>
 	</f:if>

diff --git a/Resources/Private/Partials/Content/Media/Carousel.html b/Resources/Private/Partials/Content/Media/Carousel.html
@@ -79,7 +79,9 @@ <h5>{media.title -> f:format.html()}</h5>
 			0: {'cropVariant': 'default', 'media': '(min-width: 1200px)', 'srcset': '{settings.srcsetDesktop}'},
 			1: {'cropVariant': 'tablet', 'media': '(min-width: 576px)', 'srcset': '{settings.srcsetTablet}'},
 			2: {'cropVariant': 'mobile', 'media': '(max-width: 575px)', 'srcset': '{settings.srcsetMobile}'}
-		}" picturefill="{settings.picturefill}" lazyload="{settings.lazyLoad}" ratio="{ratio}" />
+		}" picturefill="{settings.picturefill}" lazyload="{settings.lazyLoad}" ratio="{ratio}" shift="{file.properties.tx_t3sbootstrap_shift_vertical}"
+			 hshift="{file.properties.tx_t3sbootstrap_shift_horizontal}"
+ />
 	</f:else>
 </f:if>
 </f:section>
diff --git a/Resources/Private/Partials/Content/Swiper/CustomOne.html b/Resources/Private/Partials/Content/Swiper/CustomOne.html
@@ -57,6 +57,8 @@ <h2 class="text-white">{slide.header}</h2>
 	 picturefill="{settings.picturefill}"
 	 lazyload="0"
 	 ratio="{ratio}"
+	 shift="{file.properties.tx_t3sbootstrap_shift_vertical}"
+	 hshift="{file.properties.tx_t3sbootstrap_shift_horizontal}"
 	/>
 </figure>
 </f:section>
diff --git a/Resources/Private/Partials/Content/Swiper/CustomTwo.html b/Resources/Private/Partials/Content/Swiper/CustomTwo.html
@@ -61,6 +61,8 @@ <h3>BUILD YOUR OWN SLIDER</h3>
 	 picturefill="{settings.picturefill}"
 	 lazyload="0"	 
 	 ratio="{ratio}"
+	 shift="{file.properties.tx_t3sbootstrap_shift_vertical}"
+	 hshift="{file.properties.tx_t3sbootstrap_shift_horizontal}"
 	/>
 </figure>
 </f:section>
diff --git a/Resources/Private/Partials/Content/Swiper/Default.html b/Resources/Private/Partials/Content/Swiper/Default.html
@@ -161,6 +161,8 @@
 		 picturefill="{settings.picturefill}"
 		 lazyload="0"
 		 ratio="{ratio}"
+		 shift="{file.properties.tx_t3sbootstrap_shift_vertical}"
+		 hshift="{file.properties.tx_t3sbootstrap_shift_horizontal}"
 		/>
 	</f:else>
 </f:if>

diff --git a/Resources/Private/Templates/Container/BackgroundWrapper.html b/Resources/Private/Templates/Container/BackgroundWrapper.html
@@ -188,7 +188,11 @@
 															0: {'cropVariant': 'default', 'media': '(min-width: 1200px)', 'srcset': '{settings.srcsetDesktop}'},
 															1: {'cropVariant': 'tablet', 'media': '(min-width: 576px)', 'srcset': '{settings.srcsetTablet}'},
 															2: {'cropVariant': 'mobile', 'media': '(max-width: 575px)', 'srcset': '{settings.srcsetMobile}'}
-														}" picturefill="{settings.picturefill}" lazyload="{settings.lazyLoad}" ratio="0" style="{style}" />
+														}" picturefill="{settings.picturefill}" lazyload="{settings.lazyLoad}" ratio="0"
+														 style="{style}"
+														 shift="{file.properties.tx_t3sbootstrap_shift_vertical}"
+														 hshift="{file.properties.tx_t3sbootstrap_shift_horizontal}"
+														 />
 													</f:then>
 													<f:else>
 														<t3sb:media file="{file}" width="{ingWidth}" height="auto"
@@ -197,7 +201,11 @@
 															0: {'cropVariant': 'default', 'media': '(min-width: 1200px)', 'srcset': '{settings.srcsetDesktop}'},
 															1: {'cropVariant': 'tablet', 'media': '(min-width: 576px)', 'srcset': '{settings.srcsetTablet}'},
 															2: {'cropVariant': 'mobile', 'media': '(max-width: 575px)', 'srcset': '{settings.srcsetMobile}'}
-														}" picturefill="{settings.picturefill}" lazyload="0" ratio="0" style="{style}" />
+														}" picturefill="{settings.picturefill}" lazyload="0" ratio="0"
+														 style="{style}"
+														 shift="{file.properties.tx_t3sbootstrap_shift_vertical}"
+														 hshift="{file.properties.tx_t3sbootstrap_shift_horizontal}"
+														 />
 													</f:else>
 												</f:if>
 											</figure>

diff --git a/Resources/Private/Templates/Container/CardWrapper.html b/Resources/Private/Templates/Container/CardWrapper.html
@@ -292,6 +292,8 @@ <h4 class="card-title my-3">{card.backheader -> f:format.raw()}</h4>
 	 picturefill="{settings.picturefill}"
 	 lazyload="{lazyload}"
 	 ratio="{ratio}"
+	 shift="{file.properties.tx_t3sbootstrap_shift_vertical}"
+	 hshift="{file.properties.tx_t3sbootstrap_shift_horizontal}"
 	/>
 </figure>
 </f:section>

diff --git a/Resources/Private/Templates/Container/Collapsible.html b/Resources/Private/Templates/Container/Collapsible.html
@@ -34,6 +34,8 @@ <h2 class="accordion-header" id="heading-{data.uid}">
 					picturefill="0"
 					lazyload="{settings.lazyLoad}"
 					ratio="{ratio}"
+					shift="{media.properties.tx_t3sbootstrap_shift_vertical}"
+					hshift="{media.properties.tx_t3sbootstrap_shift_horizontal}"
 				/>
 			</f:if>
 			{headerFontawesome -> f:format.raw()}

diff --git a/Resources/Private/Templates/Content/Carousel.html b/Resources/Private/Templates/Content/Carousel.html
@@ -116,7 +116,8 @@
 			 picturefill="{settings.picturefill}"
 			 lazyload="{f:if(condition: owlStyle, then: '', else: settings.lazyLoad)}"
 			 ratio="{ratio}"
-			 shift="0"
+			 shift="{files.0.properties.tx_t3sbootstrap_shift_vertical}"
+			 hshift="{files.0.properties.tx_t3sbootstrap_shift_horizontal}"
 			 mobileNoRatio="{mobileNoRatio}" />
 	</f:else>
 </f:if>

diff --git a/Resources/Private/Templates/Content/ImageGallery.html b/Resources/Private/Templates/Content/ImageGallery.html
@@ -82,5 +82,7 @@
 		lazyload="{f:if(condition: '{settings.lazyLoad} == 1', then: '1', else: '0')}"
 		ratio="{data.tx_t3sbootstrap_image_ratio}"
 		columns="{data.imagecols}"
+		shift="{file.properties.tx_t3sbootstrap_shift_vertical}"
+		hshift="{file.properties.tx_t3sbootstrap_shift_horizontal}"
 	 />
 </f:section>
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -3,7 +3,7 @@
 /***************************************************************
  * Extension Manager/Repository config file for ext "t3sbootstrap".
  *
- * Auto generated 17-04-2023 18:48
+ * Auto generated 01-05-2023 20:40
  *
  * Manual updates:
  * Only the data in the array - everything else is removed by next
@@ -14,7 +14,7 @@
   'title' => 'Bootstrap Components',
   'description' => 'Startup extension to use bootstrap 5 classes, components and more out of the box. Example and info: www.t3sbootstrap.de',
   'category' => 'templates',
-  'version' => '5.2.12',
+  'version' => '5.2.13',
   'state' => 'stable',
   'uploadfolder' => false,
   'clearcacheonload' => true,