Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-19 06:26:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

"CClientScript::renderScriptBatch()" has been refactored allowing to group scripts with the same HTML options.

Browse Source
This commit is contained in:
Paul Klimov
2013-03-06 13:36:33 +02:00
parent 10d356c28a
commit a92dfe544b
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
framework/web/CClientScript.php
View File

@@ -302,28 +302,35 @@ class CClientScript extends CApplicationComponent
}
/**
* Composes script HTML block from the given script values.
* Attempts to place all scripts at single 'script' tag if possible.
* Composes script HTML block from the given script values,
* attempting to group scripts at single 'script' tag if possible.
* @param array $scripts script values to process.
* @return string HTML output
*/
protected function renderScriptBatch(array $scripts)
{
$html = '';
$noOptionsScripts = array();
$scriptBatches = array();
foreach($scripts as $scriptValue)
{
if(is_array($scriptValue))
{
$scriptContent = $scriptValue['content'];
unset($scriptValue['content']);
$html.=CHtml::script($scriptContent,$scriptValue)."\n";
$scriptHtmlOptions = $scriptValue;
}
else
$noOptionsScripts[]=$scriptValue;
{
$scriptContent = $scriptValue;
$scriptHtmlOptions = array();
}
$key=serialize(ksort($scriptHtmlOptions));
$scriptBatches[$key]['htmlOptions']=$scriptHtmlOptions;
$scriptBatches[$key]['scripts'][]=$scriptContent;
}
if(!empty($noOptionsScripts))
$html.=CHtml::script(implode("\n",$noOptionsScripts))."\n";
foreach($scriptBatches as $scriptBatch)
if(!empty($scriptBatch['scripts']))
$html.=CHtml::script(implode("\n",$scriptBatch['scripts']),$scriptBatch['htmlOptions'])."\n";
return $html;
}