wait #2228 @0:20

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 e5a9eb11744e95b78785487602b775659c13c601..8eee5613f62156563ead8db51724fa155430962f 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1010,6 +1010,7 @@ class wsHTML5Compiler
                }
 
                $pagesOfCustomLinks = [];
+               $hiddenLinks = [];
 
                foreach ($links as $linkData) {
                        if (isset($linkData['image']) && $linkData['image'] && $linkData['type'] != 28) {
@@ -1028,6 +1029,9 @@ class wsHTML5Compiler
                                        $pagesOfCustomLinks[$k][] = $linkData['page'];
                                }
                        }
+                       if ($linkData['type'] == 32) {
+                               $hiddenLinks[] = $linkData['to'];
+                       }
                }
 
                $this->config->pagesOfCustomLinks = $pagesOfCustomLinks;
@@ -1044,6 +1048,7 @@ class wsHTML5Compiler
                        if (in_array($linkData['type'], $ignore)) {
                                continue;
                        }
+                       $linkData['hidden'] = in_array($linkData['uid'], $hiddenLinks);
                        if ($linkData['type'] == 28) {
                                $this->addSEOArticle($linkData['page'], $linkData['to'], $linkData['extra'], $linkData['image']);
                                continue;

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 185b0398965872ca13ed124ac198efab525ceeb7..eac432eb8a7fae75d21e2877915a58341707124b 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -33,6 +33,7 @@ class wsHTML5Link
        public $class;
        public $uid;
        public $scorm;
+       public $hidden = false;
        public $zindex = 4;
 
        protected $_init;
@@ -164,6 +165,8 @@ class wsHTML5Link
                                } else {
                                        return new iframePopupLink($id, $init, $compiler);
                                }
+                       case 32:
+                               return new showLinkLink($id, $init, $compiler);
                        default:
                                return null;
                }
@@ -243,7 +246,7 @@ class wsHTML5Link
 
        public function getHTMLContainer()
        {
-               return '<div class="' . $this->getHTMLContainerClass() . '" data-scorm="' . $this->scorm . '" data-id="' . $this->uid . '" id="l_' . $this->id . '"' . $this->getAdditionnalContent() . '>' . $this->getHTMLContent() . '</div>';
+               return '<div class="' . $this->getHTMLContainerClass() . '" data-hidden="' . $this->hidden . '" data-scorm="' . $this->scorm . '" data-id="' . $this->uid . '" id="l_' . $this->id . '"' . $this->getAdditionnalContent() . '>' . $this->getHTMLContent() . '</div>';
        }
 
        public function getHTMLContainerClass()
@@ -394,6 +397,27 @@ class normalLink extends wsHTML5Link
 
 }
 
+class showLinkLink extends normalLink
+{
+       public function getURL()
+       {
+               return '#';
+       }
+
+       public function getClasses()
+       {
+               $res = parent::getClasses();
+               $res[] = 'showlink';
+       }
+
+       public function getAdditionnalContent()
+       {
+               $res = parent::getAdditionnalContent();
+               $res .= ' data-showid="' . $this->to . '"';
+               return $res;
+       }
+}
+
 class tooltipLink extends normalLink
 {
        public function getClasses()