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

Carousel format enhancements #857

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

Carousel format enhancements #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b47bd32
enhance getInlineStyles
thomas-topway-it Nov 2, 2024
0e0dd68
set adaptiveHeight class, hide caption on resize
thomas-topway-it Nov 2, 2024
33d4fd8
add not (.adaptiveHeight ) definitions
thomas-topway-it Nov 2, 2024
f57d927
fix slick-rows default
thomas-topway-it Nov 3, 2024
c31d08e
fix space
thomas-topway-it Nov 3, 2024
12db4d9
fix space
thomas-topway-it Nov 3, 2024
33d89c1
Merge branch 'SemanticMediaWiki:master' into carousel-format-enhancem…
thomas-topway-it Nov 3, 2024
efa2b55
Merge branch 'SemanticMediaWiki:master' into carousel-format-enhancem…
thomas-topway-it Nov 15, 2024
86fcd1b
Merge branch 'SemanticMediaWiki:master' into carousel-format-enhancem…
thomas-topway-it Feb 2, 2025
446fac4
add slick-slide wildcard
thomas-topway-it Feb 2, 2025
ae42212
set slick-slider overflow hidden
thomas-topway-it Feb 2, 2025
afa9d54
Update ext.srf.formats.carousel.css
thomas-topway-it Feb 2, 2025
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
33 changes: 23 additions & 10 deletions formats/carousel/Carousel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,12 @@ public function getParamDefinitions( array $definitions ) {
$params['slick-rows'] = [
'type' => 'integer',
'message' => 'srf-paramdesc-carousel-slick-option',
'default' => 1,
// @see https://github.com/kenwheeler/slick/issues/3110
// @see https://github.com/kenwheeler/slick/issues/3149
// despite https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/VisualData/+/a75a24be65e17021a227ac2c3b8f6e02e13f7a90/includes/classes/formats/CarouselResultPrinter.php
// works well
'default' => 0,
// 'default' => 1,
];

$params['slick-rtl'] = [
Expand Down Expand Up @@ -528,7 +533,8 @@ protected function getResultText( SMWQueryResult $results, $outputmode ) {
'div',
[
'class' => 'slick-slide',
'data-url' => $linkValue
'data-url' => $linkValue,
'style' => $inlineStyles['slide']
],
$innerContent
);
Expand All @@ -537,8 +543,8 @@ protected function getResultText( SMWQueryResult $results, $outputmode ) {

$attr = [ 'class' => 'slick-slider' . ( empty( $this->params['class'] ) ? '' : ' ' . $this->params['class'] ) ];

if ( !empty( $inlineStyles['div'] ) ) {
$attr['style'] = $inlineStyles['div'];
if ( !empty( $inlineStyles['container'] ) ) {
$attr['style'] = $inlineStyles['container'];
}

$slick_attr = [];
Expand All @@ -564,9 +570,11 @@ private function getInlineStyles() {
if ( empty( $this->params['width'] ) ) {
$this->params['width'] = '100%';
}
$img = [ 'object-fit' => 'object-fit: cover' ];
$container = [];
$slide = [];

preg_match( '/^(\d+)(.+)?$/', $this->params['width'], $match );
$styleImg = [ 'object-fit: cover' ];

$absoluteUnits = [ 'cm', 'mm', 'in', 'px', 'pt', 'pc' ];
$slidestoshow = $this->params['slick-slidestoshow'];
Expand All @@ -576,21 +584,26 @@ private function getInlineStyles() {
if ( empty( $match[2] ) ) {
$match[2] = 'px';
}
$styleImg[] = 'max-width:' . ( in_array( $match[2], $absoluteUnits ) ?
$img['max-width'] = 'max-width:' . ( in_array( $match[2], $absoluteUnits ) ?
( $match[1] / $slidestoshow ) . $match[2]
: '100%' );
}

$styleAttr = [ 'width', 'height' ];
$style = [];
foreach ( $styleAttr as $attr ) {
if ( !empty( $this->params[$attr] ) ) {
$style[ $attr ] = "$attr: " . $this->params[$attr];
$container[ $attr ] = "$attr: " . $this->params[$attr];

// *** use css inherit attribute instead
// $slide[$attr] = "$attr: " . $this->params[$attr];
}
}

return [ 'div' => implode( '; ', $style ),
'img' => implode( '; ', $styleImg ) ];
return [
'container' => implode( '; ', $container ),
'img' => implode( '; ', $img ),
'slide' => implode( '; ', $slide )
];
}

/**
Expand Down
23 changes: 22 additions & 1 deletion formats/carousel/resources/ext.srf.formats.carousel.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
.slick-slider {
overflow: hidden;
/*
*** keep commented to ensure dots are rendered, however
double-check if this causes other problems
*/
/* overflow: hidden; */
}

.slick-prev:before,
Expand Down Expand Up @@ -41,6 +45,23 @@
text-decoration: underline;
}

.slick-slider:not( .adaptiveHeight ) .slick-list,
.slick-slider:not( .adaptiveHeight ) .slick-track,
.slick-slider:not( .adaptiveHeight ) .slick-slide {
height: inherit !important;
}

.slick-slider:not( .adaptiveHeight ) .slick-track {
display: flex !important;
}

.slick-slider:not( .adaptiveHeight ) .slick-slide {
position: relative;
display: flex !important;
justify-content: center;
align-items: center;
}

@media screen and (max-width: 800px) {
.slick-slide .slick-slide-content.caption-text {
display: none;
Expand Down
30 changes: 27 additions & 3 deletions formats/carousel/resources/ext.srf.formats.carousel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,20 @@
srf.formats.carousel.prototype = {
init: function ( $slide ) {
$slide.slick( $slide.data().slick );

if ( $slide.data().slick.adaptiveHeight ) {
$slide.addClass( 'adaptiveHeight' );
}

$(".slick-slider .slick-slide").each(function () {
// hide caption frame if title is empty
// and screen < 800px
if ( $( window ).width() < 800 && !$( '.slick-slide-content.caption-title', $( this ) ).length ) {
$( '.slick-slide-content.caption', $( this ) ).hide();
} else {
$( '.slick-slide-content.caption', $( this ) ).show();
}

if ( $(this).attr('data-url') ) {
// $(this).attr('title', $(this).attr('data-title') )
$(this).css('cursor', 'pointer')
Expand Down Expand Up @@ -112,12 +124,24 @@
var carousel = new srf.formats.carousel();

$(document).ready(function () {


// hide caption frame if title is empty
// and screen < 800px
$( window ).on( 'resize', function () {
$( '.slick-slider' ).each( function () {
$( '.slick-slider .slick-slide' ).each( function () {
if ( $( window ).width() < 800 && !$( '.slick-slide-content.caption-title', $( this ) ).length ) {
$( '.slick-slide-content.caption', $( this ) ).hide();
} else {
$( '.slick-slide-content.caption', $( this ) ).show();
}
} );
} );
} );

$(".slick-slider").each(function () {
carousel.init( $(this) );
});


});
})(jQuery, mediaWiki, semanticFormats);

4 changes: 2 additions & 2 deletions tests/phpunit/Integration/JSONScript/TestCases/carousel-01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"subject": "Test/Carousel/T.1",
"assert-output": {
"to-contain": [
"<div class=\"slick-slide\" data-url=\".*/index.php/File:Gallery01.png\"><img src=\".*/images/7/7f/Gallery01.png\" alt=\"caption a\".* class=\"slick-slide-content img\".*/><div class=\"slick-slide-content caption\"><div class=\"slick-slide-content caption-title\">title a</div><div class=\"slick-slide-content caption-text\">caption a</div></div></div></div>"
"<div class=\"slick-slide\" data-url=\".*/index.php/File:Gallery01.png\".*><img src=\".*/images/7/7f/Gallery01.png\" alt=\"caption a\".* class=\"slick-slide-content img\".*/><div class=\"slick-slide-content caption\"><div class=\"slick-slide-content caption-title\">title a</div><div class=\"slick-slide-content caption-text\">caption a</div></div></div></div>"
]
}

Expand All @@ -69,7 +69,7 @@
"subject": "Test/Carousel/T.2",
"assert-output": {
"to-contain": [
"<div class=\"slick-slide\" data-url=\".*/index.php/Test/Carousel_test\"><img src=\".*/images/7/7f/Gallery01.png\" alt=\"abc\".* class=\"slick-slide-content img\".*/><div class=\"slick-slide-content caption\"><div class=\"slick-slide-content caption-title\">Carousel test</div><div class=\"slick-slide-content caption-text\">abc</div></div></div></div>"
"<div class=\"slick-slide\" data-url=\".*/index.php/Test/Carousel_test\".*><img src=\".*/images/7/7f/Gallery01.png\" alt=\"abc\".* class=\"slick-slide-content img\".*/><div class=\"slick-slide-content caption\"><div class=\"slick-slide-content caption-title\">Carousel test</div><div class=\"slick-slide-content caption-text\">abc</div></div></div></div>"
]
}
}
Expand Down