wait #6421 @1

diff --git a/src/Links/Link.php b/src/Links/Link.php
index 7e0a9ebb2565ee1e14dde8e92a46e115b6841b02..94f33d071611ffc8af3f576696ee813f7d173912 100644 (file)
--- a/src/Links/Link.php
+++ b/src/Links/Link.php
@@ -108,6 +108,7 @@ class Link
     public $uid;
     public $scorm;
     public $hidden = false;
+    public $showHidden = false;
     public $defaultZIndex = 70;
     public $zindex = -1;
     public $addzindex = 0;
@@ -155,7 +156,7 @@ class Link
     {
         $init = ArrayUtil::asArray($init);
 
-        static::normalizeAttributes($init);
+        static::normalizeDimensions($init);
 
         $init['scorm'] = self::isScorm($init);
         $init['to'] = self::replaceCustomURL($init['to']);
@@ -304,7 +305,12 @@ class Link
 
     }
 
-    public static function normalizeAttributes(&$a)
+    protected function normalizeAttributes()
+    {
+
+    }
+
+    public static function normalizeDimensions(&$a)
     {
         $numbers = ['left', 'top', 'rot', 'width', 'height'];
         foreach ($a as $k => $v) {
@@ -475,6 +481,9 @@ class Link
         }
 
         $this->id = $id;
+
+        $this->normalizeAttributes();
+
         $this->compiler = $compiler;
         $this->init();
     }
@@ -597,7 +606,9 @@ class Link
         if ($this->rightClone) {
             $res .= ' rightclone';
         }
-
+        if ($this->showHidden) {
+            $res .= ' show';
+        }
         return $res;
     }
 

diff --git a/src/Links/ShowLinkLink.php b/src/Links/ShowLinkLink.php
index 81bc9d6797d3b7d1b714df46ba4394f859533df5..7a5e46fdaabb910a8fa74f7aeed8324a6bef46ee 100644 (file)
--- a/src/Links/ShowLinkLink.php
+++ b/src/Links/ShowLinkLink.php
@@ -2,26 +2,36 @@
 
 namespace Fluidbook\Tools\Links;
 
-class ShowLinkLink extends NormalLink {
+class ShowLinkLink extends NormalLink
+{
 
-    public function init() {
+    public function init()
+    {
         $this->close_button = $this->close_button ?: $this->video_service;
     }
 
-    public function getURL() {
+    public function getURL()
+    {
         return '#';
     }
 
-    public function getClasses() {
+    public function getClasses()
+    {
         $res = parent::getClasses();
         $res[] = 'showlink';
         return $res;
     }
 
-    public function getAdditionnalContent() {
+    public function getAdditionnalContent()
+    {
         $res = parent::getAdditionnalContent();
         $this->close_button = $this->close_button ?: 'none';
         $res .= ' data-showmode="' . $this->target . '" data-showclose="' . $this->close_button . '" data-showtransition="' . ($this->transition ?: 'fadein') . '" data-showid="' . $this->to . '"';
         return $res;
     }
+
+    protected function normalizeAttributes()
+    {
+        $this->to = str_replace(' ', '', $this->to);
+    }
 }