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

$scriptFilePosition and $scriptPosition inside CClientScript renamed to $defaultScriptFilePosition and $defaultScriptPosition respectively.

Browse Source
This commit is contained in:
resurtm
2012-05-21 21:41:45 +06:00
parent fe3d98c646
commit 54b4e4d0e1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/web/CClientScript.php
View File

@@ -166,14 +166,14 @@ class CClientScript extends CApplicationComponent
* Defaults to CClientScript::POS_HEAD.
* @since 1.1.11
*/
public $scriptFilePosition=self::POS_HEAD;
public $defaultScriptFilePosition=self::POS_HEAD;
/**
* @var integer Where the scripts registered using {@link registerScript} will be inserted in the page.
* This can be one of the CClientScript::POS_* constants.
* Defaults to CClientScript::POS_READY.
* @since 1.1.11
*/
public $scriptPosition=self::POS_READY;
public $defaultScriptPosition=self::POS_READY;
private $_baseUrl;
@@ -594,7 +594,7 @@ class CClientScript extends CApplicationComponent
public function registerScriptFile($url,$position=null)
{
if($position===null)
$position=$this->scriptFilePosition;
$position=$this->defaultScriptFilePosition;
$this->hasScripts=true;
$this->scriptFiles[$position][$url]=$url;
$params=func_get_args();
@@ -619,7 +619,7 @@ class CClientScript extends CApplicationComponent
public function registerScript($id,$script,$position=null)
{
if($position===null)
$position=$this->scriptPosition;
$position=$this->defaultScriptPosition;
$this->hasScripts=true;
$this->scripts[$position][$id]=$script;
if($position===self::POS_READY || $position===self::POS_LOAD)