composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-09-01 10:58:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correctly handle included js files on the new api

Browse Source
This commit is contained in:
Stephen Abello
2026-08-27 15:26:14 +02:00
parent 5d3a3e2d95
commit 1ca78e4a41
4 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sources/Application/UI/Base/Component/Button/ButtonUIBlockFactory.php
View File

@@ -392,7 +392,7 @@ class ButtonUIBlockFactory extends AbstractUIBlockFactory
{
if ($oPopupItem instanceof JSPopupMenuItem) {
$sTooltip = $oPopupItem->GetTooltip();
if (!utils::IsNotNullOrEmptyString($sTooltip)) {
if (utils::IsNullOrEmptyString($sTooltip)) {
$sTooltip = $oPopupItem->GetLabel();
}
@@ -402,9 +402,7 @@ class ButtonUIBlockFactory extends AbstractUIBlockFactory
);
$oButton->SetOnClickJsCode($oPopupItem->GetJsCode());
foreach ($oPopupItem->GetLinkedScripts() as $sLinkedScript) {
$oButton->AddJsFileRelPath($sLinkedScript);
}
$oButton->AddMultipleJsFilesRelPaths($oPopupItem->GetLinkedScripts());
$oButton->SetActionType($sActionType);
$oButton->SetColor($sColor);
$oButton->SetAriaAttributes($oPopupItem->GetAriaAttributes()->GetAttributes());
@@ -464,15 +462,11 @@ class ButtonUIBlockFactory extends AbstractUIBlockFactory
if (utils::IsNotNullOrEmptyString($oPopupItem->GetTooltip())) {
$oButton->SetTooltip($oPopupItem->GetTooltip());
}
$oButton->SetOnClickJsCode($oPopupItem->GetJsCode());
$oButton->AddMultipleJsFilesRelPaths($oPopupItem->GetLinkedScripts());
$oButton->SetAriaAttributes($oPopupItem->GetAriaAttributes()->GetAttributes());
$oButton->SetDataAttributes($oPopupItem->GetDataAttributes()->GetAttributes());
$oButton->SetOnClickJsCode($oPopupItem->GetJsCode());
foreach ($oPopupItem->GetLinkedScripts() as $sLinkedScript) {
$oButton->AddJsFileRelPath($sLinkedScript);
}
return $oButton;
} elseif ($oPopupItem instanceof URLPopupMenuItem) {
$oButton = self::MakeForLink(