Skip to content

Commit f4bded1

Browse files
pxamikedmh
authored andcommitted
[!!!][TASK] Update Parallax (Jarallax), fix #423 (#424)
* [TASK] upgraded jarallax to 1.10.3. - Updated the javascript configuration for it. * [FIX] jarallax - better handling of http/https urls (https urls would break in Edge) * [TASK] jarallax - disable parallax-effect in Edge, since the effect generally lags and doesn't currently work in EdgeHTML17 (see issue #110 in github) * [FIX] Parallax grid-element: - changed attribute on parallax-video from data-jarallax-video to data-video-url. - changed javascript for parallax-video to use this field - removed css for parallax that overwrote the background-image (the js of jarallax takes cares of this) - we can't disable parallax for Edge on video-elements without also disabling the video, so enabled it again (compared to images it does seem to work in latest Edge) - compileLess, compiledCss * [TASK] removal of console.log * [TASK] removal of console.log
1 parent bcd686f commit f4bded1

File tree

11 files changed

+1774
-399
lines changed

11 files changed

+1774
-399
lines changed

Resources/Private/Templates/GridElements/Parallax.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<f:if condition="{files.0.type} == 4">
55
<f:if condition="{files.1}">
66
<f:then>
7-
<div class="parallax parallax-video {f:if(condition: data.pi_flexform.data.columns.lDEF.hideInMobile.vDEF, then: ' hidden-xs hidden-sm')}" data-jarallax-video="{f:uri.typolink(parameter: 'file:{files.0.originalFile.uid}')}" style="background-image: url('{f:uri.image(image : files.1.originalFile)}'); height: {f:if(condition: data.pi_flexform.data.columns.lDEF.height.vDEF, then: data.pi_flexform.data.columns.lDEF.height.vDEF, else: 'auto')};" > </f:then>
7+
<div class="parallax parallax-video {f:if(condition: data.pi_flexform.data.columns.lDEF.hideInMobile.vDEF, then: ' hidden-xs hidden-sm')}" data-video-url="{f:uri.typolink(parameter: 'file:{files.0.originalFile.uid}')}" style="background-image: url('{f:uri.image(image : files.1.originalFile)}'); height: {f:if(condition: data.pi_flexform.data.columns.lDEF.height.vDEF, then: data.pi_flexform.data.columns.lDEF.height.vDEF, else: 'auto')};" > </f:then>
88
<f:else>
9-
<div class="parallax parallax-video {f:if(condition: data.pi_flexform.data.columns.lDEF.hideInMobile.vDEF, then: ' hidden-xs hidden-sm')}" data-jarallax-video="{f:uri.typolink(parameter: 'file:{files.0.originalFile.uid}')}" style=" height: {f:if(condition: data.pi_flexform.data.columns.lDEF.height.vDEF, then: data.pi_flexform.data.columns.lDEF.height.vDEF, else: 'auto')};" >
9+
<div class="parallax parallax-video {f:if(condition: data.pi_flexform.data.columns.lDEF.hideInMobile.vDEF, then: ' hidden-xs hidden-sm')}" data-video-url="{f:uri.typolink(parameter: 'file:{files.0.originalFile.uid}')}" style=" height: {f:if(condition: data.pi_flexform.data.columns.lDEF.height.vDEF, then: data.pi_flexform.data.columns.lDEF.height.vDEF, else: 'auto')};" >
1010
</f:else>
1111
</f:if>
1212
</f:if>

0 commit comments

Comments
 (0)