Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased](https://github.com/shift72/core-template/compare/1.9.20...HEAD)

### Fixed
- Turn off infinite scroll on the wishlist/continue watching sliders. This
caused some funkiness if items were removed after scrolling the slider.

## [1.9.20](https://github.com/shift72/core-template/compare/1.9.19...1.9.20)

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion site/static/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ function documentReady(app) {
let swipers = document.getElementsByClassName('swiper-container');
for (let i = 0; i < swipers.length; i++) {
let el = swipers[i];
if (el.getAttribute('is-wishlist') == undefined) {
if (el.getAttribute('is-dynamic-slider') == undefined) {
let swiper = initializeSwiper(el, false);
init(swiper);

Expand Down
2 changes: 1 addition & 1 deletion site/templates/collection/continue_watching.jet
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
class="user-continue-watching s72-slider s72-hide">
<section class="page-collection" aria-label="{{i18n("wcag_aria_label_continue_watching")}}">
<div class="collection-wrapper-container swiper-wrapper-container">
<div class="collection-container swiper-container" data-items-per-row="{{itemsPerRow}}" data-layout="{{layout}}">
<div class="collection-container swiper-container" is-dynamic-slider disable-infinite-scroll data-items-per-row="{{itemsPerRow}}" data-layout="{{layout}}">
{{if i18n("continue_watching_slider_header") != ""}}
<div class="swiper-title">
<h3>{{i18n("continue_watching_slider_header")}}</h3>
Expand Down
51 changes: 19 additions & 32 deletions site/templates/collection/wishlist.jet
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactored this file to match what I did on continue_watching when I originally copypasta'd this

Original file line number Diff line number Diff line change
@@ -1,47 +1,34 @@
{{import "./page_collection_item.jet"}}
{{import "../common/slider.jet"}}
{{import "./slider-buttons.jet"}}
{{block wishlistCollection()}}

{{if config("default_image_type") == "portrait"}}
<s72-userwishlist
render-as-slider="false"
hide-if-empty="true"
partials-base-path="/partials"
partials-classes="swiper-slide"
partials-insert-point-selector=".swiper-wrapper"
force-login="false"
data-items-per-page="6" data-item-layout="portrait" class="user-wishlist s72-slider s72-hide">

{{else}}
{{block wishlistCollection()}}
{{layout := config("default_image_type")}}
{{itemsPerRow := layout == "portrait" ? 6 : 4}}
<s72-userwishlist
render-as-slider="false"
hide-if-empty="true"
partials-base-path="/partials"
partials-classes="swiper-slide"
partials-insert-point-selector=".swiper-wrapper"
force-login="false"
data-items-per-page="4" data-item-layout="landscape" class="user-wishlist s72-slider s72-hide">

{{end}}
<section class="page-collection" aria-label="{{i18n("wcag_aria_label_wishlist")}}">
<div class="collection-wrapper-container swiper-wrapper-container">
{{if config("default_image_type") == "portrait"}}
<div class="collection-container swiper-container" is-wishlist="true" data-items-per-row="6" data-layout="portrait">
{{else}}
<div class="collection-container swiper-container" is-wishlist="true" data-items-per-row="4" data-layout="landscape">
{{end}}
{{if i18n("userwishlist_slider_header") != ""}}
data-item-layout="{{layout}}"
data-items-per-page="{{itemsPerRow}}"
class="user-wishlist s72-slider s72-hide">
<section class="page-collection" aria-label="{{i18n("wcag_aria_label_wishlist")}}">
<div class="collection-wrapper-container swiper-wrapper-container">
<div class="collection-container swiper-container" is-dynamic-slider disable-infinite-scroll data-items-per-row="{{itemsPerRow}}" data-layout="{{layout}}">
{{if i18n("userwishlist_slider_header") != ""}}
<div class="swiper-title">
<h3>{{i18n("userwishlist_slider_header")}}</h3>
</div>
{{end}}
<div class="swiper-wrapper">
{{yield content}}
<h3>{{i18n("userwishlist_slider_header")}}</h3>
</div>
{{end}}
<div class="swiper-wrapper">
{{yield content}}
</div>
</div>
{{ yield sliderButtons() }}
</div>
</section>
</s72-userwishlist>
{{yield sliderButtons()}}
</div>
</section>
</s72-userwishlist>
{{end}}