From: vincent@cubedesigners.com Date: Thu, 17 Sep 2020 14:13:14 +0000 (+0000) Subject: . X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7109ec0f9708525022b027a852f55100c8ced710;p=cubeextranet.git . --- 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 ef238a552..7c38cf506 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.links.php +++ b/inc/ws/Util/html5/master/class.ws.html5.links.php @@ -308,12 +308,12 @@ class wsHTML5Link if ($k == 'extra') { if (CubeIT_Util_Json::isJson($v)) { $v = CubeIT_Util_Json::decode($v); - } else if (stristr($v, '=') && stristr($v, '&')) { + } else if (strpos($v, '=') !== false && strpos($v, '&') !== false) { $vv = $v; $v = []; parse_str($vv, $v); $v = CubeIT_Util_Object::asObject($v); - } else if (stristr($v, '=')) { + } else if (strpos($v, '=') !== false) { $extras = self::parseExtras($v); foreach ($extras as $extrak => $extrav) { $this->$extrak = $extrav; @@ -488,8 +488,12 @@ class wsHTML5Link $css .= wsHTML5::writeCSSUA('transform', 'rotate(' . $this->rot . 'deg)'); $origin = true; } - if (isset($this->extra->skewX)) { - $css .= wsHTML5::writeCSSUA('transform', 'skewX(' . $this->extra->skewX . 'deg)'); + if (isset($this->skewX)) { + $css .= wsHTML5::writeCSSUA('transform', 'skewX(' . $this->skewX . 'deg)'); + $origin = true; + } + if (isset($this->skew)) { + $css .= wsHTML5::writeCSSUA('transform', 'skew(' . $this->skew . ')'); $origin = true; } @@ -793,8 +797,8 @@ class contentLink extends wsHTML5Link } } $res .= ' data-animations="' . htmlspecialchars(json_encode($animations), ENT_QUOTES) . '" '; - if($this->_isHiddenFirst($animations)){ - $res.=' data-animation-hide '; + if ($this->_isHiddenFirst($animations)) { + $res .= ' data-animation-hide '; } return $res; @@ -804,7 +808,7 @@ class contentLink extends wsHTML5Link { $hiddenAnimations = ['reveal', 'fadein', 'translatefrom']; foreach ($animations as $animation) { - if(in_array($animation['type'],$hiddenAnimations)){ + if (in_array($animation['type'], $hiddenAnimations)) { return true; } }