From aee8e1b66e6f877afe681f97627b2a4416679037 Mon Sep 17 00:00:00 2001 From: Henning Leutz <leutz@pcsg.de> Date: Mon, 2 Oct 2017 13:33:30 +0200 Subject: [PATCH] fix: quiqqer/package-bricks#69 --- bin/Controls/Slider/PromosliderWallpaper.js | 29 +++++++++---------- .../Controls/Slider/PromosliderWallpaper.html | 4 +-- .../Slider/PromosliderWallpaper2Content.html | 4 +-- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/bin/Controls/Slider/PromosliderWallpaper.js b/bin/Controls/Slider/PromosliderWallpaper.js index 57d6117..26ba174 100644 --- a/bin/Controls/Slider/PromosliderWallpaper.js +++ b/bin/Controls/Slider/PromosliderWallpaper.js @@ -245,8 +245,8 @@ define('package/quiqqer/bricks/bin/Controls/Slider/PromosliderWallpaper', [ // click event var Li = this.$List.getElement('li:nth-child(' + parseInt(currentSlide + 1) + ')'); - if (Li.get('data-url') && Li.get('data-url') !== '') { - window.location = Li.get('data-url'); + if (Li.get('data-href') && Li.get('data-href') !== '') { + window.location = Li.get('data-href'); return; } } @@ -308,18 +308,17 @@ define('package/quiqqer/bricks/bin/Controls/Slider/PromosliderWallpaper', [ }); // click events - this.$Container.getElements("li[data-url]").each(function (LiElement) { - - // if (LiElement.get('data-url') === '') { - // return; - // } - // - // LiElement.setStyle('cursor', 'pointer'); - // LiElement.addEvent('click', function () { - // if (QUI.isScrolling() === false) { - // window.location = this.get('data-url'); - // } - // }); + this.$Container.getElements("li[data-href]").each(function (LiElement) { + if (LiElement.get('data-href') === '') { + return; + } + + LiElement.setStyle('cursor', 'pointer'); + LiElement.addEvent('click', function () { + if (QUI.isScrolling() === false) { + window.location = this.get('data-href'); + } + }); }); @@ -603,7 +602,7 @@ define('package/quiqqer/bricks/bin/Controls/Slider/PromosliderWallpaper', [ var self = this, Background = Slide.getElement('.quiqqer-bricks-promoslider-wallpaper-image'), display = Background.getStyle('display'), - image = Slide.get('data-url'); + image = Slide.get('data-image'); if (display !== 'none') { return; diff --git a/src/QUI/Bricks/Controls/Slider/PromosliderWallpaper.html b/src/QUI/Bricks/Controls/Slider/PromosliderWallpaper.html index b5d4752..b443957 100644 --- a/src/QUI/Bricks/Controls/Slider/PromosliderWallpaper.html +++ b/src/QUI/Bricks/Controls/Slider/PromosliderWallpaper.html @@ -2,7 +2,7 @@ {strip} <ul class="hide-on-mobile"> {foreach $desktopSlides as $key => $slide} - <li data-url="{image image=$slide.image onlysrc=1}"> + <li data-image="{image image=$slide.image onlysrc=1}" data-href="{$slide.url}"> {assign var=extraClass value=""} {if isset($slide.pos) && $slide.pos == 'quiqqer-bricks-promoslider-slide-right'} @@ -42,7 +42,7 @@ {strip} <ul class="hide-on-desktop"> {foreach $mobileSlides as $key => $slide} - <li data-url="{image image=$slide.image onlysrc=1}"> + <li data-image="{image image=$slide.image onlysrc=1}" data-href="{$slide.url}"> {assign var=extraClass value=""} {if isset($slide.pos) && $slide.pos == 'quiqqer-bricks-promoslider-slide-right'} diff --git a/src/QUI/Bricks/Controls/Slider/PromosliderWallpaper2Content.html b/src/QUI/Bricks/Controls/Slider/PromosliderWallpaper2Content.html index 205f44b..8e4d92f 100644 --- a/src/QUI/Bricks/Controls/Slider/PromosliderWallpaper2Content.html +++ b/src/QUI/Bricks/Controls/Slider/PromosliderWallpaper2Content.html @@ -2,7 +2,7 @@ {strip} <ul class="hide-on-mobile"> {foreach $desktopSlides as $key => $slide} - <li data-url="{image image=$slide.image onlysrc=1}"> + <li data-image="{image image=$slide.image onlysrc=1}" data-href="{$slide.url}"> <div class="quiqqer-bricks-promoslider-wallpaper-image" style="display: none"> </div> <div class="grid-container"> @@ -25,7 +25,7 @@ {strip} <ul class="hide-on-desktop"> {foreach $mobileSlides as $key => $slide} - <li data-url="{image image=$slide.image onlysrc=1}"> + <li data-image="{image image=$slide.image onlysrc=1}" data-href="{$slide.url}"> <div class="quiqqer-bricks-promoslider-wallpaper-image" style="display: none"> </div> <div class="grid-container"> -- GitLab