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

(Fixes issue 1711)

Browse Source
This commit is contained in:
qiang.xue
2010-10-29 20:40:12 +00:00
parent 40b4120457
commit 470375c257
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/web/CClientScript.php
View File

@@ -360,7 +360,7 @@ class CClientScript extends CApplicationComponent
if(isset($this->scripts[self::POS_LOAD]))
{
if($fullPage)
$scripts[]="window.onload=function() {\n".implode("\n",$this->scripts[self::POS_LOAD])."\n};";
$scripts[]="jQuery(window).load(function() {\n".implode("\n",$this->scripts[self::POS_LOAD])."\n});";
else
$scripts[]=implode("\n",$this->scripts[self::POS_LOAD]);
}
@@ -490,7 +490,7 @@ class CClientScript extends CApplicationComponent
{
$this->_hasScripts=true;
$this->scripts[$position][$id]=$script;
if($position===self::POS_READY)
if($position===self::POS_READY || $position===self::POS_LOAD)
$this->registerCoreScript('jquery');
$params=func_get_args();
$this->recordCachingAction('clientScript','registerScript',$params);