wait #4219 @0.5

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 928c873b79473134a87c1d508f5a164c55cd2fc4..fca24f5a133dea50d172787274177de5b182b699 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -467,6 +467,12 @@ class wsHTML5Link
         if ($this->maxWidth > 0) {
             $res .= ' data-max-width="' . $this->maxWidth . '"';
         }
+        if ($this->tooltipBackgroundColor) {
+            $res .= 'data-tooltip-background="' . $this->tooltipBackgroundColor . '" ';
+        }
+        if ($this->tooltipColor) {
+            $res .= 'data-tooltip-color="' . $this->tooltipColor . '" ';
+        }
 
         return $res;
 
@@ -737,7 +743,11 @@ class tooltipLink extends normalLink
         if ($this->color) {
             $res .= 'data-tooltip-color="' . $this->color . '" ';
         }
-        $res .= ' data-tooltip-maxwidth="' . $this->compiler->book->parametres->linkTooltipMaxWidth . '" ';
+        if ($this->tooltipMaxWidth) {
+            $res .= ' data-tooltip-maxwidth="' . $this->tooltipMaxWidth . '" ';
+        } else {
+            $res .= ' data-tooltip-maxwidth="' . $this->compiler->book->parametres->linkTooltipMaxWidth . '" ';
+        }
         $res .= ' data-tooltip-touch="1" ';
         return $res;
     }
@@ -1984,7 +1994,7 @@ class wescoLink extends normalLink
 
     public function getTarget()
     {
-        return '_blank';
+        return '_popupiframe';
     }
 
     public function getDefaultTooltip()