fix #2215 @1

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 2a8efc7e54d4481d2094d06ac41ef291f99cd486..5974acf99a3d71371fda056d35ea665b4bcc295e 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -1073,6 +1073,7 @@ class htmlMultimediaLink extends wsHTML5Link
                        }
 
                        $res = '';
+                       $s = $this->in_popup ? 1 : $this->getCssScale();
                        if ($this->_config['html']) {
                                $this->_url = $d['fdir'] . '/' . $this->_config['html'];
                                if ($this->extra) {
@@ -1087,10 +1088,9 @@ class htmlMultimediaLink extends wsHTML5Link
                                        $ld = ' data-ld="' . str_replace('index.html', $this->_config['lowDef'], $this->_url) . '" ';
                                }
 
-                               $res = '<iframe ' . $ld . ' data-width="' . $iw . '" data-height="' . $ih . '" width="' . $iw . '" height="' . $ih . '" src="' . $this->_url . '" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" allowfullscreen mozallowfullscreen="true" webkitallowfullscreen="true" onmousewheel="" style="visibility:hidden;" onload="this.style.visibility=\'visible\';"></iframe>';
+                               $res = '<iframe' . $ld . 'data-scale="' . $s . '" data-width="' . $iw . '" data-height="' . $ih . '" width="' . $iw . '" height="' . $ih . '" src="' . $this->_url . '" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" allowfullscreen mozallowfullscreen="true" webkitallowfullscreen="true" onmousewheel="" style="visibility:hidden;" onload="this.style.visibility=\'visible\';"></iframe>';
                        }
                        if ($this->_externalIframe !== false) {
-                               $s = $this->in_popup ? 1 : $this->getCssScale();
                                $iw = $this->_config['width'] * $s;
                                $ih = $this->_config['height'] * $s;
                                $res = '<iframe data-scale="' . $s . '" data-width="' . $iw . '" data-height="' . $ih . '"  width="' . $iw . '" height="' . $ih . '" src="' . $this->_externalIframe . '" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" allowfullscreen mozallowfullscreen="true" webkitallowfullscreen="true" onmousewheel="" style="visibility:hidden;" onload="this.style.visibility=\'visible\';"></iframe>';
@@ -1708,6 +1708,10 @@ class iframePopupLink extends normalLink
                return '#/iframe/' . md5($this->to);
        }
 
+       public function getTrack()
+       {
+               return ' data-track="' . $this->to . '"';
+       }
 
        public function getAdditionnalContent()
        {