From: vincent@cubedesigners.com Date: Thu, 17 Feb 2022 19:03:00 +0000 (+0000) Subject: wip #4508 @0.25 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=331b558810928a167c63443e28d9a31c3177cebe;p=cubeextranet.git wip #4508 @0.25 --- diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php index 380bead5c..d9a086227 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php @@ -46,7 +46,9 @@ class wsHTML5Compiler ['js/libs/gsap/TweenMax.min.js', 'js/libs/gsap/jquery.gsap.min.js', 'js/libs/gsap/plugins/ScrollToPlugin.min.js', - 'js/libs/threejs/Tweenmax.threejs.js',], + 'js/libs/gsap/utils/Draggable.min.js', + 'js/libs/threejs/Tweenmax.threejs.js', + ], 'hammer' => ['js/libs/hammer.min.js',], 'interactjs' => ['js/libs/interact.min.js'], 'gal' => diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php index f979a5c95..f662f9a1e 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.links.php +++ b/inc/ws/Util/html5/master/class.ws.html5.links.php @@ -1044,10 +1044,15 @@ class contentLink extends wsHTML5Link { public $defaultZIndex = 30; public $allowsAnimation = true; + public $interactive = false; public function getHTMLContainerClass() { - return parent::getHTMLContainerClass() . ' contentLink'; + $res = parent::getHTMLContainerClass() . ' contentLink '; + if ($this->interactive) { + $res .= ' interactive'; + } + return $res; } public function getAdditionnalContent() @@ -1074,6 +1079,10 @@ class contentLink extends wsHTML5Link $this->parallax = $animation['parallax']; unlink($animation['parallax']); } + if ($animation['type'] === 'draggable') { + $this->defaultZIndex = 70; + $this->interactive = true; + } } $res .= ' data-animations="' . htmlspecialchars(json_encode($animations), ENT_QUOTES) . '" '; if ($this->_isHiddenFirst($animations)) {