composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-22 00:32:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3123 : Improved JavaScript management in web pages and ajax pages

Browse Source
This commit is contained in:
acognet
2020-12-08 08:59:01 +01:00
parent 0808a76226
commit 5ccb12453a
11 changed files with 185 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sources/Renderer/BlockRenderer.php
View File

@@ -127,26 +127,27 @@ class BlockRenderer
/**
* Return the raw output of the JS template
*
* @param string $sType javascript type only JS_TYPE_ON_INIT / JS_TYPE_ON_READY / JS_TYPE_LIVE
*
* @return string
* @throws \ReflectionException
* @throws \Twig\Error\LoaderError
* @throws \Twig\Error\RuntimeError
* @throws \Twig\Error\SyntaxError
*/
public function RenderJsInline()
public function RenderJsInline(string $sType)
{
$sOutput = '';
if(!empty($this->oBlock->GetJsTemplateRelPath()))
if(!empty($this->oBlock->GetJsTemplateRelPath($sType)))
{
$sOutput = TwigHelper::RenderTemplate(
static::$oTwigEnv,
$this->GetTemplateParameters(),
$this->oBlock->GetJsTemplateRelPath(),
TwigHelper::ENUM_FILE_TYPE_JS
$this->oBlock->GetJsTemplateRelPath($sType),
$sType
);
}
return $sOutput;
return trim($sOutput);
}
/**
@@ -171,7 +172,7 @@ class BlockRenderer
);
}
return $sOutput;
return trim($sOutput);
}
/**