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

N°2737 - RenderBlockTemplate enhancement, uilinkswidget UIBlock refactor

Browse Source
This commit is contained in:
Eric
2020-12-16 11:05:30 +01:00
parent d2bc651fc6
commit 1b115624a2
25 changed files with 612 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
sources/application/WebPage/AjaxPage.php
View File

@@ -16,7 +16,6 @@ class AjaxPage extends WebPage implements iTabbedPage
*
* @var array
*/
protected $m_aReadyScripts;
protected $m_oTabs;
private $m_sMenu; // If set, then the menu will be updated
const DEFAULT_PAGE_TEMPLATE_REL_PATH = 'pages/backoffice/ajaxpage/layout';
@@ -32,7 +31,6 @@ class AjaxPage extends WebPage implements iTabbedPage
$bPrintable = ($sPrintable == '1');
parent::__construct($s_title, $bPrintable);
$this->m_aReadyScripts = [];
//$this->add_header("Content-type: text/html; charset=utf-8");
$this->no_cache();
$this->add_xframe_options();
@@ -149,14 +147,7 @@ class AjaxPage extends WebPage implements iTabbedPage
header($s_header);
}
// CSS files
foreach ($this->oContentLayout->GetCssFilesUrlRecursively(true) as $sFileAbsUrl) {
$this->add_linked_stylesheet($sFileAbsUrl);
}
// JS files
foreach ($this->oContentLayout->GetJsFilesUrlRecursively(true) as $sFileAbsUrl) {
$this->add_linked_script($sFileAbsUrl);
}
BlockRenderer::RenderCssJsInPage($this, $this->oContentLayout);
// Render the blocks
// Additional UI widgets to be activated inside the ajax fragment
@@ -172,9 +163,6 @@ EOF
}
$this->outputCollapsibleSectionInit();
$this->RenderInlineScriptsAndCSSRecursively($this->oContentLayout);
$aData = [];
$aData['oLayout'] = $this->oContentLayout;
$aData['aDeferredBlocks'] = $this->GetDeferredBlocks($this->oContentLayout);
@@ -190,7 +178,8 @@ EOF
'aCssInline' => $this->a_styles,
'aJsFiles' => $this->a_linked_scripts,
'aJsInlineLive' => $this->a_scripts,
'aJsInlineOnDomReady' => $this->m_aReadyScripts,
'aJsInlineOnDomReady' => $this->a_ready_scripts,
'aJsInlineOnInit' => $this->a_init_scripts,
'bEscapeContent' => ($this->sContentType == 'text/html') && ($this->sContentDisposition == 'inline'),
// TODO 3.0.0: TEMP, used while developping, remove it.
'sSanitizedContent' => utils::FilterXSS($this->s_content),
@@ -357,36 +346,6 @@ EOF
$this->s_deferred_content .= $s_html;
}
/**
* @param \Combodo\iTop\Application\UI\Base\iUIBlock $oBlock
*
* @throws \ReflectionException
* @throws \Twig\Error\LoaderError
* @throws \Twig\Error\RuntimeError
* @throws \Twig\Error\SyntaxError
*/
public function RenderInlineScriptsAndCSSRecursively(iUIBlock $oBlock): void
{
$oBlockRenderer = new BlockRenderer($oBlock);
$this->add_script($oBlockRenderer->RenderJsInline(iUIBlock::JS_TYPE_LIVE));
$this->add_ready_script($oBlockRenderer->RenderJsInline(iUIBlock::JS_TYPE_ON_INIT));
$this->add_ready_script($oBlockRenderer->RenderJsInline(iUIBlock::JS_TYPE_ON_READY));
$this->add_style($oBlockRenderer->RenderCssInline());
foreach ($oBlock->GetSubBlocks() as $oSubBlock) {
$this->RenderInlineScriptsAndCSSRecursively($oSubBlock);
}
}
/**
* @inheritDoc
*/
public function add_ready_script($sScript)
{
if (!empty(trim($sScript))) {
$this->m_aReadyScripts[] = $sScript;
}
}
/**
* @inheritDoc
*/