Skip to content

Commit

Permalink
[!!!][TASK] Update Parallax (Jarallax), fix #423 (#424)
Browse files Browse the repository at this point in the history
* [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
  • Loading branch information
pxamike authored and dmh committed Jun 22, 2018
1 parent bcd686f commit f4bded1
Show file tree
Hide file tree
Showing 11 changed files with 1,774 additions and 399 deletions.
4 changes: 2 additions & 2 deletions Resources/Private/Templates/GridElements/Parallax.html
Expand Up @@ -4,9 +4,9 @@
<f:if condition="{files.0.type} == 4">
<f:if condition="{files.1}">
<f:then>
<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>
<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>
<f:else>
<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')};" >
<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')};" >
</f:else>
</f:if>
</f:if>
Expand Down

0 comments on commit f4bded1

Please sign in to comment.