From 501870a0a5c072dce7708db4d54e20c6c93ba50b Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Fri, 16 Feb 2018 10:31:13 +0000 Subject: [PATCH] #1942 --- inc/ws/Util/html5/master/class.ws.html5.links.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 fbb2b0c1d..a3779beb8 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.links.php +++ b/inc/ws/Util/html5/master/class.ws.html5.links.php @@ -831,6 +831,7 @@ class htmlMultimediaLink extends wsHTML5Link { protected $_config = null; protected $_content = ''; protected $_url; + protected $_externalIframe = false; public $zindex = 2; public function getHTMLContent() { @@ -856,12 +857,10 @@ class htmlMultimediaLink extends wsHTML5Link { $this->copyExternalFile($d['dir'] . '/' . $this->alternative); } if (substr($this->alternative, 0, 4) == 'http') { - $this->_url = $externalIframe = $this->alternative; - $this->_config = array('html' => false, 'width' => $this->width * $this->getCssScale(), 'height' => $this->height * $this->getCssScale()); + $this->_url = $this->_externalIframe = $this->alternative; + $this->_config = array('html' => false, 'width' => $this->width, 'height' => $this->height); } - $w = $this->width * $this->getCssScale(); - $h = $this->height * $this->getCssScale(); $res = ''; if ($this->_config['html']) { $this->_url = $d['fdir'] . '/' . $this->_config['html']; @@ -874,10 +873,10 @@ class htmlMultimediaLink extends wsHTML5Link { $res = ''; } - if (isset($externalIframe)) { + if (isset($this->_externalIframe)) { $iw = $this->_config['width']; $ih = $this->_config['height']; - $res = ''; + $res = ''; } foreach ($this->_config['inject'] as $i) { @@ -933,6 +932,9 @@ class htmlMultimediaLink extends wsHTML5Link { $css .= $this->getCSSZIndex(); $css .= $this->getCSS(); $css .= '}'; + if ($this->_externalIframe) { + $css .= '#l_' . $this->id . '>iframe{' . wsHTML5::writeCSSUA('transform', 'scale(' . $this->getCssScale() . ')') . '}'; + } return $css; } -- 2.39.5