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

merge from 1.0

Browse Source
This commit is contained in:
qiang.xue
2009-01-07 04:03:34 +00:00
parent 9dc6a0dbe3
commit 9429d0f7ec
15 changed files with 240 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
framework/web/CClientScript.php
View File

@@ -128,8 +128,10 @@ class CClientScript extends CApplicationComponent
if($html!=='')
{
$output=preg_replace('/(<title\b[^>]*>|<\\/head\s*>)/is',$html.'$1',$output,1,$count);
if(!$count)
$output=preg_replace('/(<title\b[^>]*>|<\\/head\s*>)/is','<###head###>$1',$output,1,$count);
if($count)
$output=str_replace('<###head###>',$html,$output);
else
$output=$html.$output;
}
}
@@ -151,8 +153,10 @@ class CClientScript extends CApplicationComponent
if($html!=='')
{
$output=preg_replace('/(<body\b[^>]*>)/is','$1'.$html,$output,1,$count);
if(!$count)
$output=preg_replace('/(<body\b[^>]*>)/is','$1<###begin###>'.$html,$output,1,$count);
if($count)
$output=str_replace('<###begin###>',$html,$output);
else
$output=$html.$output;
}
}
@@ -163,27 +167,39 @@ class CClientScript extends CApplicationComponent
*/
protected function renderBodyEnd(&$output)
{
if(!isset($this->_scriptFiles[self::POS_END]) && !isset($this->_scripts[self::POS_END])
&& !isset($this->_scripts[self::POS_READY]) && !isset($this->_scripts[self::POS_LOAD]))
return;
$output=preg_replace('/(<\\/body\s*>)/is','<###end###>$1',$output,1,$fullPage);
$html='';
if(isset($this->_scriptFiles[self::POS_END]))
{
foreach($this->_scriptFiles[self::POS_END] as $scriptFile)
$html.=CHtml::scriptFile($scriptFile)."\n";
}
$scripts=isset($this->_scripts[self::POS_END]) ? $this->_scripts[self::POS_END] : array();
if(isset($this->_scripts[self::POS_READY]))
$scripts[]="jQuery(document).ready(function() {\n".implode("\n",$this->_scripts[self::POS_READY])."\n});";
{
if($fullPage)
$scripts[]="jQuery(document).ready(function() {\n".implode("\n",$this->_scripts[self::POS_READY])."\n});";
else
$scripts[]=implode("\n",$this->_scripts[self::POS_READY]);
}
if(isset($this->_scripts[self::POS_LOAD]))
$scripts[]="window.onload=function() {\n".implode("\n",$this->_scripts[self::POS_LOAD])."\n};";
{
if($fullPage)
$scripts[]="window.onload=function() {\n".implode("\n",$this->_scripts[self::POS_LOAD])."\n};";
else
$scripts[]=implode("\n",$this->_scripts[self::POS_LOAD]);
}
if(!empty($scripts))
$html.=CHtml::script(implode("\n",$scripts))."\n";
if($html!=='')
{
$output=preg_replace('/(<\\/body\s*>)/is',$html.'$1',$output,1,$count);
if(!$count)
$output=$output.$html;
}
if($fullPage)
$output=str_replace('<###end###>',$html,$output);
else
$output=$output.$html;
}
/**