From a3041cad1d09394d5c7feb9291032aa9a3e45a9b Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 14 Nov 2023 19:14:35 +0100 Subject: [PATCH] wait #6421 @1 --- src/Links/Link.php | 17 ++++++++++++++--- src/Links/ShowLinkLink.php | 20 +++++++++++++++----- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/Links/Link.php b/src/Links/Link.php index 7e0a9eb..94f33d0 100644 --- 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 81bc9d6..7a5e46f 100644 --- 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); + } } -- 2.39.5